Merge branch 'develop' into feature/sse-filter-settings

This commit is contained in:
Julia Radzhabova 2016-05-18 14:58:27 +03:00
commit a52c65e6d1
67 changed files with 854 additions and 1888 deletions

View file

@ -13,11 +13,14 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
<div id="editor_sdk">
<script type="text/javascript">
var editor = new Asc.asc_docs_api("editor_sdk");
editor.asc_SetFontsPath("../../../../sdkjs/fonts/");
window['AscNotLoadAllScript'] = true;
var editor = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
});
editor.LoadFontsFromServer();
</script>
</body>

View file

@ -57,7 +57,7 @@ define([
return new Asc.asc_CCommentDataWord(null);
}
return new asc_CCommentData(null);
return new Asc.asc_CCommentData(null);
}
Common.Controllers.Comments = Backbone.Controller.extend(_.extend({

View file

@ -278,6 +278,7 @@ define([
hide: function () {
Common.UI.BaseView.prototype.hide.call(this,arguments);
this.fireEvent('hide', this );
this.textBoxAutoSizeLocked = undefined;
},
setupLayout: function () {
@ -340,6 +341,7 @@ define([
// text box setup autosize input text
this.setupAutoSizingTextBox();
this.txtMessage.bind('input propertychange', _.bind(this.updateHeightTextBox, this));
},
updateLayout: function (applyUsersAutoSizig) {
@ -373,18 +375,17 @@ define([
this.lineHeight = parseInt(this.txtMessage.css('lineHeight'), 10) * 1.25; // TODO: need fix
this.updateHeightTextBox(true);
this.txtMessage.bind('input propertychange', _.bind(this.updateHeightTextBox, this));
},
updateHeightTextBox: function (event) {
var textBox, controlHeight, contentHeight, height,
var textBox = this.txtMessage,
controlHeight, contentHeight, height,
textBoxMinHeightIndent = 36 + 4; // 4px - autosize line height + big around border
textBox = $('#chat-msg-text', this.el);
height = this.panelBox.height();
if (event && 0 == textBox.val().length) {
this.layout.setResizeValue(1, Math.max(-this.addMessageBoxHeight, height - this.addMessageBoxHeight));
this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight));
this.textBoxAutoSizeLocked = undefined;
return;
}
@ -407,7 +408,7 @@ define([
height = this.panelBox.height();
this.layout.setResizeValue(1,
Math.max(-this.addMessageBoxHeight,
Math.max(this.addMessageBoxHeight,
Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)));
},

View file

@ -301,184 +301,12 @@
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
<!--sdk-->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellcheckapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguagesAll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/translations.js"></script>
<!--Drawings -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Joined.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ShapePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ImagePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/GroupPrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<!--Drawings -->
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Field.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Document.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Search.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/document/empty.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/versionHistory.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/StyleManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/MailMerge.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/TrackRevisions.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!--application-->
<script type="text/javascript" src="../../common/Gateway.js"></script>

View file

@ -293,7 +293,7 @@
<!--sdk-->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script>
<!--application-->
<link href="../../../apps/documenteditor/embed/resources/css/app-all.css" rel="stylesheet">

View file

@ -704,13 +704,11 @@ var ApplicationController = new(function(){
});
window["flat_desine"] = true;
api = new Asc.asc_docs_api("editor_sdk");
api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
});
if (api){
api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/");
api.Init();
api.asc_registerCallback('asc_onError', onError);
api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady);
api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument);

View file

@ -58,7 +58,7 @@ require.config({
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',

View file

@ -111,7 +111,10 @@ define([
// Initialize api
this.api = new Asc.asc_docs_api("editor_sdk");
window["flat_desine"] = true;
this.api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
});
if (this.api){
switch (value) {
@ -119,11 +122,6 @@ define([
case '1': this.api.SetFontRenderingMode(1); break;
case '2': this.api.SetFontRenderingMode(2); break;
}
window["flat_desine"] = true;
this.api.CreateComponents();
this.api.asc_SetFontsPath("../../../../sdkjs/fonts/");
this.api.Init();
this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this));
this.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(this.onDocumentContentReady, this));
@ -545,12 +543,12 @@ define([
var me = this;
if (me._state.timerSave===undefined)
me._state.timerSave = setInterval(function(){
if ((new Date()) - me._state.isSaving>2000) {
if ((new Date()) - me._state.isSaving>500) {
clearInterval(me._state.timerSave);
me.getApplication().getController('Statusbar').setStatusCaption('');
me._state.timerSave = undefined;
}
}, 2000);
}, 500);
} else
this.getApplication().getController('Statusbar').setStatusCaption('');
}
@ -709,7 +707,7 @@ define([
documentHolderController.getView('DocumentHolder').changePosition();
me.loadLanguages();
var shapes = me.api.get_PropertyEditorShapes();
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
@ -768,7 +766,6 @@ define([
if (!window['AscDesktopEditor']) {
var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9);
!Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}'));
if (tips.length) me.showTips(tips);
}
@ -857,7 +854,7 @@ define([
rightmenuController.createDelayedElements();
var shapes = me.api.get_PropertyEditorShapes();
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
@ -1248,20 +1245,6 @@ define([
this._state.isDisconnected = true;
},
getBrowseZoomLevel: function() {
if (Common.Utils.isIE) {
return screen.logicalXDPI/screen.deviceXDPI;
} else {
var zoom = window.outerWidth / document.documentElement.clientWidth;
if (Common.Utils.isSafari) {
zoom = Math.floor(zoom * 10) / 10;
}
return zoom;
}
},
showTips: function(strings) {
var me = this;
if (!strings.length) return;

View file

@ -1464,7 +1464,7 @@ define([
this.onSectionProps(section);
return;
} else {
var props = new CDocumentSectionProps();
var props = new Asc.CDocumentSectionProps();
props.put_TopMargin(item.value[0]);
props.put_LeftMargin(item.value[1]);
props.put_BottomMargin(item.value[2]);

View file

@ -1,36 +1,31 @@
<div id="id-adv-table-width" class="settings-panel active">
<div class="inner-content">
<table cols="1" style="width: 100%;">
<table cols="3">
<tr>
<td class="padding-small" width="125px">
<td colspan="3" class="padding-small">
<label class="header"><%= scope.textTableSize %></label>
</td>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 11px;">
<div id="tableadv-checkbox-width"></div>
</td>
</tr>
<tr>
<td class="padding-large">
<div id="tableadv-number-width" style="display: inline-block; margin-right: 10px;"></div>
<div id="tableadv-cmb-unit" style="display: inline-block;"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<div id="tableadv-checkbox-spacing"></div>
<label class="input-label"><%= scope.textWidth %></label>
<div id="tableadv-number-width" style="margin-right: 10px;"></div>
</td>
<td class="padding-small">
<label class="input-label"><%= scope.textMeasure %></label>
<div id="tableadv-cmb-unit" style="width: 115px;"></div>
</td>
</tr>
<tr>
<td class="padding-large">
<div id="tableadv-number-spacing"></div>
</td>
</tr>
<tr>
<td colspan="2" class="padding-large">
<td colspan="3" class="padding-large">
<div id="tableadv-checkbox-autofit"></div>
</td>
</tr>
</table>
</div>
<div class="separator horizontal padding-large"></div>
<div class="inner-content">
<div class="padding-small"></div>
<table cols="2" style="width: 100%;">
<tr>
<td colspan=2 class="padding-small">
@ -48,33 +43,52 @@
</td>
</tr>
<tr>
<td class="padding-small">
<td class="padding-large">
<label class="input-label"><%= scope.textBottom %></label>
<div id="tableadv-number-margin-table-bottom"></div>
</td>
<td class="padding-small">
<td class="padding-large">
<label class="input-label"><%= scope.textRight %></label>
<div id="tableadv-number-margin-table-right"></div>
</td>
</tr>
</table>
<div class="padding-small"></div>
<table cols="2">
<tr>
<td colspan="2" class="padding-small">
<label class="header"><%= scope.textOptions %></label>
</td>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 19px;">
<div id="tableadv-checkbox-spacing"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textAllowSpacing %></label>
<div id="tableadv-number-spacing"></div>
</td>
</tr>
</table>
</div>
<div class="inner-content">
</div>
</div>
<div id="id-adv-table-cell-props" class="settings-panel">
<div class="inner-content">
<table cols="3" style="width: 100%;">
<table cols="3">
<tr>
<td colspan="3" class="padding-small">
<label class="header"><%= scope.textCellSize %></label>
</td>
</tr>
<tr>
<td style="vertical-align: bottom; padding-bottom: 18px;">
<td style="vertical-align: bottom; padding-bottom: 19px;">
<div id="tableadv-checkbox-prefwidth"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textPrefWidth %></label>
<div id="tableadv-number-prefwidth"></div>
<div id="tableadv-number-prefwidth" style="margin-right: 10px;"></div>
</td>
<td class="padding-large">
<label class="input-label"><%= scope.textMeasure %></label>
@ -132,10 +146,11 @@
</div>
<div id="id-adv-table-wrap" class="settings-panel">
<div class="inner-content padding-large">
<label class="header padding-small" style="display: block;"><%= scope.textWrappingStyle %></label>
<div id="tableadv-button-wrap-none" style="display: inline-block; margin-right:5px;"></div>
<div id="tableadv-button-wrap-parallel" style="display: inline-block; margin-right:5px;"></div>
</div>
<div class="separator horizontal padding-large"></div>
<div class="padding-small"></div>
<div class="inner-content">
<div id="tableadv-panel-align" style="width: 100%;">
<label class="header padding-small"><%= scope.textAlign %></label>
@ -143,10 +158,10 @@
<div id="tableadv-button-align-left" style="display: inline-block; margin-right:5px;"></div>
<div id="tableadv-button-align-center" style="display: inline-block; margin-right:5px;"></div>
<div id="tableadv-button-align-right" style="display: inline-block; margin-right:5px;"></div>
<div style="display: inline-block; vertical-align: bottom; margin-left: 20px; margin-bottom: 1px;">
<label class="input-label" style="display: block;"><%= scope.textIndLeft %></label>
<div id="tableadv-number-indent"></div>
</div>
<div>
<label class="input-label" style="margin-right:5px;"><%= scope.textIndLeft %></label>
<div id="tableadv-number-indent" style="display: inline-block;vertical-align: middle;"></div>
</div>
</div>
<div id="tableadv-panel-distance" class="settings-hidden" style="width: 100%;">

View file

@ -201,7 +201,7 @@ define([
},
getSettings: function() {
var props = new CDocumentSectionProps();
var props = new Asc.CDocumentSectionProps();
props.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(this.spnTop.getNumberValue()));
props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue()));
props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue()));

View file

@ -607,10 +607,8 @@ define([
this.api = api;
if (this.api) {
this.api.asc_registerCallback('asc_onImgWrapStyleChanged', _.bind(this._ImgWrapStyleChanged, this));
this.api.SetInterfaceDrawImagePlaceShape('shape-texture-img');
var textures = this.api.get_PropertyStandartTextures();
if (textures)
this.onInitStandartTextures(textures);
this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img');
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
}
return this;
},

View file

@ -63,11 +63,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
_.extend(this.options, {
title: this.textTitle,
items: [
{panelId: 'id-adv-table-width', panelCaption: this.textWidthSpaces},
{panelId: 'id-adv-table-wrap', panelCaption: this.textWrap},
{panelId: 'id-adv-table-width', panelCaption: this.textTable},
{panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps},
{panelId: 'id-adv-table-borders', panelCaption: this.textBordersBackgroung},
{panelId: 'id-adv-table-position', panelCaption: this.textPosition},
{panelId: 'id-adv-table-cell-props', panelCaption: this.textCellProps}
{panelId: 'id-adv-table-position', panelCaption: this.textTablePosition},
{panelId: 'id-adv-table-wrap', panelCaption: this.textWrap}
],
contentTemplate: _.template(contentTemplate)({
scope: this
@ -143,7 +143,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.chWidth = new Common.UI.CheckBox({
el: $('#tableadv-checkbox-width'),
value: true,
labelText: this.textWidth
labelText: ''
});
this.chWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var value = (newValue=='checked');
@ -160,7 +160,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.nfWidth = new Common.UI.MetricSpinner({
el: $('#tableadv-number-width'),
step: .1,
width: 85,
width: 115,
defaultUnit : "cm",
value: '10 cm',
maxValue: 55.88,
@ -174,8 +174,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
var currmetric = Common.Utils.Metric.getCurrentMetric();
this.cmbUnit = new Common.UI.ComboBox({
el : $('#tableadv-cmb-unit'),
style : 'width: 85px;',
menuStyle : 'min-width: 85px;',
style : 'width: 115px;',
menuStyle : 'min-width: 115px;',
editable : false,
cls : 'input-group-nr',
data : [
@ -197,7 +197,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.chAllowSpacing = new Common.UI.CheckBox({
el: $('#tableadv-checkbox-spacing'),
value: true,
labelText: this.textAllowSpacing
labelText: ''
});
this.chAllowSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var value = (newValue=='checked');
@ -217,7 +217,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.nfSpacing = new Common.UI.MetricSpinner({
el: $('#tableadv-number-spacing'),
step: .1,
width: 85,
width: 115,
defaultUnit : "cm",
value: '0.5 cm',
maxValue: 2.14,
@ -1065,7 +1065,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.CellBackContainer = $('#tableadv-panel-cell-back');
this.TableBackContainer = $('#tableadv-panel-table-back');
this.btnsCategory[4].on('click', _.bind(this.onCellCategoryClick, this));
this.btnsCategory[1].on('click', _.bind(this.onCellCategoryClick, this));
this.afterRender();
},
@ -1473,11 +1473,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
if (this._changedProps && btn.pressed) {
if (this._state.alignChanged) {
if (this._state.HAlignType===Asc.c_oAscXAlign.Left)
this.btnAlignLeft.toggle(true, true);
this.btnAlignLeft.toggle(true);
else if (this._state.HAlignType==Asc.c_oAscXAlign.Center)
this.btnAlignCenter.toggle(true, true);
this.btnAlignCenter.toggle(true);
else if (this._state.HAlignType==Asc.c_oAscXAlign.Right)
this.btnAlignRight.toggle(true, true);
this.btnAlignRight.toggle(true);
this._state.alignChanged = false;
}
@ -2106,7 +2106,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
},
textWidth: 'Width',
textAllowSpacing: 'Allow spacing between cells',
textAllowSpacing: 'Spacing between cells',
textAlign: 'Alignment',
textIndLeft: 'Indent from Left',
textWidthSpaces: 'Width & Spaces',
@ -2124,7 +2124,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textRightTooltip: 'Right',
textCenterTooltip: 'Center',
textTitle: 'Table - Advanced Settings',
textDefaultMargins: 'Default Margins',
textDefaultMargins: 'Default Cell Margins',
textCheckMargins: 'Use default margins',
textBordersBackgroung: 'Borders & Background',
textOnlyCells: 'For selected cells only',
@ -2154,7 +2154,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textOptions: 'Options',
textAnchorText: 'Text',
textAutofit: 'Automatically resize to fit contents',
textCellProps: 'Cell Properties',
textCellProps: 'Cell',
tipAll: 'Set Outer Border and All Inner Lines',
tipNone: 'Set No Borders',
tipInner: 'Set Inner Lines Only',
@ -2173,7 +2173,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textPrefWidth: 'Preferred width',
textMeasure: 'Measure in',
textCellOptions: 'Cell Options',
textWrapText: 'Wrap text'
textWrapText: 'Wrap text',
textTable: 'Table',
textTableSize: 'Table Size',
textTablePosition: 'Table Position',
textWrappingStyle: 'Wrapping Style'
}, DE.Views.TableSettingsAdvanced || {}));
});

View file

@ -1060,7 +1060,7 @@ define([
createDelayedElements: function() {
this.UpdateThemeColors();
this.fillTransform(this.api.get_PropertyEditorTextArts());
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
},
fillTextArt: function() {

View file

@ -40,8 +40,6 @@
'use strict';
var reqerr;
require.config();
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module

View file

@ -233,186 +233,15 @@
<script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
<!-- debug end -->
<!-- 3rdparty -->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<!-- sdk -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellcheckapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguagesAll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/translations.js"></script>
<!--Drawings -->
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ShapePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ImagePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/GroupPrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<!--Drawings -->
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Field.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Document.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Search.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/document/empty.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/versionHistory.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/StyleManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/MailMerge.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/TrackRevisions.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!-- application -->
<script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>
</body>

View file

@ -1307,7 +1307,7 @@
"DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Allow spacing between cells",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
"DE.Views.TableSettingsAdvanced.textAnchorText": "Text",
"DE.Views.TableSettingsAdvanced.textAutofit": "Automatically resize to fit contents",
"DE.Views.TableSettingsAdvanced.textBackColor": "Cell Background",
@ -1317,11 +1317,11 @@
"DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borders & Background",
"DE.Views.TableSettingsAdvanced.textBorderWidth": "Border Size",
"DE.Views.TableSettingsAdvanced.textBottom": "Bottom",
"DE.Views.TableSettingsAdvanced.textCellProps": "Cell Properties",
"DE.Views.TableSettingsAdvanced.textCellProps": "Cell",
"DE.Views.TableSettingsAdvanced.textCenter": "Center",
"DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center",
"DE.Views.TableSettingsAdvanced.textCheckMargins": "Use default margins",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Margins",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Cell Margins",
"DE.Views.TableSettingsAdvanced.textDistance": "Distance from Text",
"DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal",
"DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from Left",
@ -1342,7 +1342,10 @@
"DE.Views.TableSettingsAdvanced.textRightOf": "to the right of",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "Right",
"DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors",
"DE.Views.TableSettingsAdvanced.textTable": "Table",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
"DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
"DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors",
"DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings",
"DE.Views.TableSettingsAdvanced.textTop": "Top",
@ -1352,6 +1355,7 @@
"DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping",
"DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table",
"DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow table",
"DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
"DE.Views.TableSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines",
"DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only",
"DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only",

View file

@ -1313,11 +1313,11 @@
"DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Границы и фон",
"DE.Views.TableSettingsAdvanced.textBorderWidth": "Ширина границ",
"DE.Views.TableSettingsAdvanced.textBottom": "Снизу",
"DE.Views.TableSettingsAdvanced.textCellProps": "Свойства ячейки",
"DE.Views.TableSettingsAdvanced.textCellProps": "Ячейка",
"DE.Views.TableSettingsAdvanced.textCenter": "По центру",
"DE.Views.TableSettingsAdvanced.textCenterTooltip": "По центру",
"DE.Views.TableSettingsAdvanced.textCheckMargins": "Использовать поля по умолчанию",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Поля по умолчанию",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Поля ячейки по умолчанию",
"DE.Views.TableSettingsAdvanced.textDistance": "Расстояние до текста",
"DE.Views.TableSettingsAdvanced.textHorizontal": "По горизонтали",
"DE.Views.TableSettingsAdvanced.textIndLeft": "Отступ слева",
@ -1338,7 +1338,10 @@
"DE.Views.TableSettingsAdvanced.textRightOf": "справа от",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "По правому краю",
"DE.Views.TableSettingsAdvanced.textStandartColors": "Стандартные цвета",
"DE.Views.TableSettingsAdvanced.textTable": "Таблица",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Фон таблицы",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Положение таблицы",
"DE.Views.TableSettingsAdvanced.textTableSize": "Размер таблицы",
"DE.Views.TableSettingsAdvanced.textThemeColors": "Цвета темы",
"DE.Views.TableSettingsAdvanced.textTitle": "Таблица - дополнительные параметры",
"DE.Views.TableSettingsAdvanced.textTop": "Сверху",

View file

@ -58,12 +58,10 @@ Ext.define('DE.controller.Main', {
var api = this.api,
app = this.getApplication();
api = new Asc.asc_docs_api("id-sdkeditor");
api.SetMobileVersion(true);
api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/");
api.Init();
api.initEvents2MobileAdvances();
api = new Asc.asc_docs_api({
'id-view' : 'id-sdkeditor',
'mobile' : true
});
api.asc_registerCallback('asc_onStartAction', Ext.bind(this.onLongActionBegin, this));
api.asc_registerCallback('asc_onError', Ext.bind(this.onError, this));

View file

@ -215,188 +215,12 @@
<script type="text/javascript" src="app.js"></script>
<script type="text/javascript" src="../../common/locale.js"></script>
<!-- SDK -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellcheckapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguagesAll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/translations.js"></script>
<!--Drawings -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Joined.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ShapePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ImagePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/GroupPrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<!--Drawings -->
<!-- -->
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Field.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Document.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Search.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/document/empty.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/versionHistory.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/StyleManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/MailMerge.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Private/TrackRevisions.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
</head>
<body>
<script type="text/javascript">

View file

@ -221,7 +221,7 @@
<!-- SDK -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script>
</head>
<body>
<script type="text/javascript">

View file

@ -0,0 +1,149 @@
var sdk_dev_scrpipts = [
"../../../../sdkjs/common/AllFonts.js",
"../../../../sdkjs/common/browser.js",
"../../../../sdkjs/common/commonDefines.js",
"../../../../sdkjs/common/downloaderfiles.js",
"../../../../sdkjs/common/docscoapicommon.js",
"../../../../sdkjs/common/docscoapi.js",
"../../../../sdkjs/common/spellcheckapi.js",
"../../../../sdkjs/common/spellCheckLanguage.js",
"../../../../sdkjs/common/spellCheckLanguagesAll.js",
"../../../../sdkjs/common/apiCommon.js",
"../../../../sdkjs/common/SerializeCommonWordExcel.js",
"../../../../sdkjs/common/editorscommon.js",
"../../../../sdkjs/common/NumFormat.js",
"../../../../sdkjs/common/SerializeChart.js",
"../../../../sdkjs/common/AdvancedOptions.js",
"../../../../sdkjs/common/FontsFreeType/font_engine.js",
"../../../../sdkjs/common/FontsFreeType/FontFile.js",
"../../../../sdkjs/common/FontsFreeType/font_map.js",
"../../../../sdkjs/common/FontsFreeType/FontManager.js",
"../../../../sdkjs/common/Drawings/Metafile.js",
"../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
"../../../../sdkjs/common/Drawings/WorkEvents.js",
"../../../../sdkjs/word/Editor/History.js",
"../../../../sdkjs/common/Shapes/EditorSettings.js",
"../../../../sdkjs/common/Shapes/Serialize.js",
"../../../../sdkjs/common/Shapes/SerializeWriter.js",
"../../../../sdkjs/common/Drawings/Hit.js",
"../../../../sdkjs/common/Drawings/ArcTo.js",
"../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/Format/Constants.js",
"../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js",
"../../../../sdkjs/common/Drawings/Format/GraphicObjectBase.js",
"../../../../sdkjs/common/Drawings/Format/Shape.js",
"../../../../sdkjs/common/Drawings/Format/Path.js",
"../../../../sdkjs/common/Drawings/Format/Image.js",
"../../../../sdkjs/common/Drawings/Format/GroupShape.js",
"../../../../sdkjs/common/Drawings/Format/ChartSpace.js",
"../../../../sdkjs/common/Drawings/Format/ChartFormat.js",
"../../../../sdkjs/common/Drawings/Format/TextBody.js",
"../../../../sdkjs/common/Drawings/Format/GraphicFrame.js",
"../../../../sdkjs/common/Charts/charts.js",
"../../../../sdkjs/common/Charts/DrawingArea.js",
"../../../../sdkjs/common/Charts/DrawingObjects.js",
"../../../../sdkjs/common/Charts/3DTransformation.js",
"../../../../sdkjs/common/Charts/ChartsDrawer.js",
"../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js",
"../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/Spline.js",
"../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js",
"../../../../sdkjs/common/Drawings/TextDrawer.js",
"../../../../sdkjs/common/Drawings/Externals.js",
"../../../../sdkjs/common/GlobalLoaders.js",
"../../../../sdkjs/common/CollaborativeEditingBase.js",
"../../../../sdkjs/common/Controls.js",
"../../../../sdkjs/common/Overlay.js",
"../../../../sdkjs/common/Drawings/HatchPattern.js",
"../../../../sdkjs/common/scroll.js",
"../../../../sdkjs/common/Scrolls/iscroll.js",
"../../../../sdkjs/common/wordcopypaste.js",
"../../../../sdkjs/word/apiDefines.js",
"../../../../sdkjs/cell/utils/utils.js",
"../../../../sdkjs/cell/model/WorkbookElems.js",
"../../../../sdkjs/cell/model/Workbook.js",
"../../../../sdkjs/cell/model/Serialize.js",
"../../../../sdkjs/cell/model/CellInfo.js",
"../../../../sdkjs/word/Drawing/translations.js",
"../../../../sdkjs/word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../../../../sdkjs/word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../../../../sdkjs/word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../../../../sdkjs/word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../../../../sdkjs/word/Editor/GraphicObjects/GraphicObjects.js",
"../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js",
"../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js",
"../../../../sdkjs/word/Editor/CollaborativeEditing.js",
"../../../../sdkjs/word/Editor/Comments.js",
"../../../../sdkjs/word/Editor/Styles.js",
"../../../../sdkjs/word/Editor/ParagraphContent.js",
"../../../../sdkjs/word/Editor/Paragraph.js",
"../../../../sdkjs/word/Editor/DocumentContentBase.js",
"../../../../sdkjs/word/Editor/Document.js",
"../../../../sdkjs/word/Editor/DocumentContent.js",
"../../../../sdkjs/word/Editor/FlowObjects.js",
"../../../../sdkjs/word/Editor/ParagraphContentBase.js",
"../../../../sdkjs/word/Editor/Hyperlink.js",
"../../../../sdkjs/word/Editor/Field.js",
"../../../../sdkjs/word/Editor/Run.js",
"../../../../sdkjs/word/Editor/Math.js",
"../../../../sdkjs/word/Editor/Paragraph_Recalculate.js",
"../../../../sdkjs/word/Editor/Sections.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/word/Editor/HeaderFooter.js",
"../../../../sdkjs/word/Editor/Common.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/word/Editor/Table.js",
"../../../../sdkjs/word/Editor/Table/TableRecalculate.js",
"../../../../sdkjs/word/Editor/Table/TableDraw.js",
"../../../../sdkjs/word/Editor/Table/TableRow.js",
"../../../../sdkjs/word/Editor/Table/TableCell.js",
"../../../../sdkjs/word/Editor/Serialize2.js",
"../../../../sdkjs/word/Editor/Search.js",
"../../../../sdkjs/word/Editor/FontClassification.js",
"../../../../sdkjs/word/Editor/Spelling.js",
"../../../../sdkjs/word/Drawing/Graphics.js",
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
"../../../../sdkjs/word/Drawing/DrawingDocument.js",
"../../../../sdkjs/word/Drawing/GraphicsEvents.js",
"../../../../sdkjs/word/Drawing/Rulers.js",
"../../../../sdkjs/word/Drawing/HtmlPage.js",
"../../../../sdkjs/word/Drawing/documentrenderer.js",
"../../../../sdkjs/word/apiCommon.js",
"../../../../sdkjs/common/apiBase.js",
"../../../../sdkjs/word/api.js",
"../../../../sdkjs/word/document/empty.js",
"../../../../sdkjs/word/Editor/CollaborativeEditing.js",
"../../../../sdkjs/word/Math/mathTypes.js",
"../../../../sdkjs/word/Math/mathText.js",
"../../../../sdkjs/word/Math/mathContent.js",
"../../../../sdkjs/word/Math/base.js",
"../../../../sdkjs/word/Math/fraction.js",
"../../../../sdkjs/word/Math/degree.js",
"../../../../sdkjs/word/Math/matrix.js",
"../../../../sdkjs/word/Math/limit.js",
"../../../../sdkjs/word/Math/nary.js",
"../../../../sdkjs/word/Math/radical.js",
"../../../../sdkjs/word/Math/operators.js",
"../../../../sdkjs/word/Math/accent.js",
"../../../../sdkjs/word/Math/borderBox.js",
"../../../../sdkjs/common/Private/Locks.js",
"../../../../sdkjs/common/Private/license.js",
"../../../../sdkjs/common/Private/versionHistory.js",
"../../../../sdkjs/word/Private/comments.js",
"../../../../sdkjs/word/Private/StyleManager.js",
"../../../../sdkjs/word/Private/MailMerge.js",
"../../../../sdkjs/word/Private/TrackRevisions.js",
"../../../../sdkjs/common/applyDocumentChanges.js",
"../../../../sdkjs/common/Drawings/Format/OleObject.js",
"../../../../sdkjs/common/clipboard_base.js",
"../../../../sdkjs/common/plugins.js",
"../../../../sdkjs/word/apiBuilder.js"
];

View file

@ -300,177 +300,12 @@
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
<!--sdk-->
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script src="../../../../sdkjs/common/Drawings/States.js"></script>
<script src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Presentation.js"></script>
<script src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/slide/Editor/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Slide.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/SlideMaster.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Layout.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Private/comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/Search.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!--application-->
<script type="text/javascript" src="../../common/Gateway.js"></script>

View file

@ -293,7 +293,7 @@
<!--sdk-->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/sdk-all-min.js"></script>
<!--application-->
<link href="../../../apps/presentationeditor/embed/resources/css/app-all.css" rel="stylesheet">

View file

@ -712,13 +712,12 @@ var ApplicationController = new(function(){
}, 2000);
});
api = new Asc.asc_docs_api("editor_sdk");
api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
});
if (api){
api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/");
api.SetThemesPath("../../../../sdkjs/slide/themes/");
api.Init();
api.asc_registerCallback('asc_onError', onError);
api.asc_registerCallback('asc_onDocumentContentReady', onDocumentContentReady);

View file

@ -57,7 +57,7 @@ require.config({
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all',
sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',

View file

@ -105,16 +105,14 @@ define([
// Initialize api
this.api = new Asc.asc_docs_api("editor_sdk");
window["flat_desine"] = true;
this.api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
});
if (this.api){
window["flat_desine"] = true;
this.api.CreateComponents();
this.api.SetDrawingFreeze(true);
this.api.asc_SetFontsPath("../../../../sdkjs/fonts/");
this.api.SetThemesPath("../../../../sdkjs/slide/themes/");
this.api.Init();
this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this));
this.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(this.onDocumentContentReady, this));
@ -371,12 +369,12 @@ define([
var me = this;
if (me._state.timerSave===undefined)
me._state.timerSave = setInterval(function(){
if ((new Date()) - me._state.isSaving>2000) {
if ((new Date()) - me._state.isSaving>500) {
clearInterval(me._state.timerSave);
me.getApplication().getController('Statusbar').setStatusCaption('');
me._state.timerSave = undefined;
}
}, 2000);
}, 500);
} else
this.getApplication().getController('Statusbar').setStatusCaption('');
}
@ -526,7 +524,7 @@ define([
me.api.asc_registerCallback('asc_onFocusObject', _.bind(me.onFocusObject, me));
me.api.asc_registerCallback('asc_onUpdateLayout', _.bind(me.fillLayoutsStore, me)); // slide layouts loading
me.updateThemeColors();
var shapes = me.api.get_PropertyEditorShapes();
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
me.fillTextArt(me.api.asc_getTextArtPreviews());
@ -567,7 +565,6 @@ define([
if (!window['AscDesktopEditor']) {
var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9);
!Common.Utils.isGecko && (Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}'));
if (tips.length) me.showTips(tips);
}
@ -651,7 +648,7 @@ define([
me.api.asc_registerCallback('asc_onFocusObject', _.bind(me.onFocusObject, me));
me.api.asc_registerCallback('asc_onUpdateLayout', _.bind(me.fillLayoutsStore, me)); // slide layouts loading
me.updateThemeColors();
var shapes = me.api.get_PropertyEditorShapes();
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
me.fillTextArt(me.api.asc_getTextArtPreviews());
@ -1017,20 +1014,6 @@ define([
// this.getFileMenu().setMode({isDisconnected:true});
},
getBrowseZoomLevel: function() {
if (Common.Utils.isIE) {
return screen.logicalXDPI/screen.deviceXDPI;
} else {
var zoom = window.outerWidth / document.documentElement.clientWidth;
if (Common.Utils.isSafari) {
zoom = Math.floor(zoom * 10) / 10;
}
return zoom;
}
},
showTips: function(strings) {
var me = this;
if (!strings.length) return;

View file

@ -121,18 +121,23 @@ define([
},
onPreview: function(btn, e) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');
if (previewPanel) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview'),
me = this;
if (previewPanel && me.api) {
previewPanel.show();
if (!this.statusbar.mode.isDesktopApp)
this.fullScreen(document.documentElement);
var onWindowResize = function() {
Common.NotificationCenter.off('window:resize', onWindowResize);
if (this.api) {
var current = this.api.getCurrentPage();
this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0);
var current = me.api.getCurrentPage();
me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0);
Common.component.Analytics.trackEvent('Status Bar', 'Preview');
}
};
if (!me.statusbar.mode.isDesktopApp) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
} else
onWindowResize();
}
},

View file

@ -69,6 +69,7 @@ define([
slidelayoutdisable:undefined,
shapecontrolsdisable:undefined,
no_paragraph: undefined,
no_text: undefined,
no_object: undefined,
clrtext: undefined,
linespace: undefined,
@ -287,8 +288,6 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this));
this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight());
this.onSetupCopyStyleButton();
},
@ -562,6 +561,7 @@ define([
slide_deleted = undefined,
slide_layout_lock = undefined,
no_paragraph = true,
no_text = true,
no_object = true;
while (++i < selectedObjects.length) {
@ -570,6 +570,7 @@ define([
if (type == Asc.c_oAscTypeSelectElement.Paragraph) {
paragraph_locked = pr.get_Locked();
no_paragraph = false;
no_text = false;
no_object = false;
} else if (type == Asc.c_oAscTypeSelectElement.Slide) {
slide_deleted = pr.get_LockDelete();
@ -577,6 +578,9 @@ define([
} else if (type == Asc.c_oAscTypeSelectElement.Image || type == Asc.c_oAscTypeSelectElement.Shape || type == Asc.c_oAscTypeSelectElement.Chart || type == Asc.c_oAscTypeSelectElement.Table) {
shape_locked = pr.get_Locked();
no_object = false;
if (type !== Asc.c_oAscTypeSelectElement.Image) {
no_text = false;
}
}
}
@ -591,9 +595,14 @@ define([
this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: [me.toolbar.btnCopyStyle]});
}
if (this._state.no_text !== no_text) {
if (this._state.activated) this._state.no_text = no_text;
this.toolbar.lockToolbar(PE.enumLock.noTextSelected, no_text, {array: me.toolbar.paragraphControls});
}
if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) {
if (this._state.activated) this._state.shapecontrolsdisable = shape_locked;
this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls});
this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)});
}
if (this._state.no_object !== no_object ) {
@ -737,18 +746,23 @@ define([
},
onPreview: function(btn, e) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');
if (previewPanel) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview'),
me = this;
if (previewPanel && me.api) {
previewPanel.show();
if (!this.toolbar.mode.isDesktopApp)
this.fullScreen(document.documentElement);
var onWindowResize = function() {
Common.NotificationCenter.off('window:resize', onWindowResize);
if (this.api) {
var current = this.api.getCurrentPage();
this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0);
var current = me.api.getCurrentPage();
me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0);
Common.component.Analytics.trackEvent('ToolBar', 'Preview');
}
};
if (!me.toolbar.mode.isDesktopApp) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
} else
onWindowResize();
}
},
@ -1752,6 +1766,7 @@ define([
},
activateControls: function() {
this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight());
this.toolbar.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)});
this._state.activated = true;
},

View file

@ -123,6 +123,7 @@ define([
onWindowResize: function(e) {
this.onLayoutChanged('window');
Common.NotificationCenter.trigger('window:resize');
}
});
});

View file

@ -667,13 +667,17 @@ define([
e.stopPropagation();
if (me.slidesCount>0) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');
if (previewPanel && !previewPanel.isVisible()) {
if (previewPanel && !previewPanel.isVisible() && me.api) {
previewPanel.show();
if (!me.mode.isDesktopApp)
me.fullScreen(document.documentElement);
if (me.api) {
var onWindowResize = function() {
Common.NotificationCenter.off('window:resize', onWindowResize);
me.api.StartDemonstration('presentation-preview', 0);
}
};
if (!me.mode.isDesktopApp) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
} else
onWindowResize();
}
}
};
@ -924,16 +928,21 @@ define([
caption : me.txtPreview
}).on('click', function(item) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');
if (previewPanel) {
if (previewPanel && me.api) {
previewPanel.show();
me.fullScreen(document.documentElement);
var onWindowResize = function() {
Common.NotificationCenter.off('window:resize', onWindowResize);
if (me.api) {
var current = me.api.getCurrentPage();
me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0);
Common.component.Analytics.trackEvent('DocumentHolder', 'Preview');
}
};
if (!me.mode.isDesktopApp) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
} else
onWindowResize();
}
});

View file

@ -569,10 +569,8 @@ define([
setApi: function(api) {
this.api = api;
if (this.api) {
this.api.SetInterfaceDrawImagePlaceShape('shape-texture-img');
var textures = this.api.get_PropertyStandartTextures();
if (textures)
this.onInitStandartTextures(textures);
this.api.asc_setInterfaceDrawImagePlaceShape('shape-texture-img');
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
}
return this;
},

View file

@ -564,9 +564,7 @@ define([
this.api = api;
if (this.api) {
this.api.SetInterfaceDrawImagePlaceSlide('slide-texture-img');
var textures = this.api.get_PropertyStandartTextures();
if (textures)
this.onInitStandartTextures(textures);
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
}
return this;
},

View file

@ -585,9 +585,7 @@ define([
this.api = api;
if (this.api) {
this.api.SetInterfaceDrawImagePlaceTextArt('textart-texture-img');
var textures = this.api.get_PropertyStandartTextures();
if (textures)
this.onInitStandartTextures(textures);
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
}
return this;
},
@ -1500,7 +1498,7 @@ define([
this.PatternFillType = this.patternViewData[0].type;
}
this.UpdateThemeColors();
this.fillTransform(this.api.get_PropertyEditorTextArts());
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
},
onInitStandartTextures: function(texture) {

View file

@ -79,7 +79,8 @@ define([
noParagraphSelected: 'no-paragraph',
noObjectSelected: 'no-object',
disableOnStart: 'on-start',
cantPrint: 'cant-print'
cantPrint: 'cant-print',
noTextSelected: 'no-text'
};
PE.Views.Toolbar = Backbone.View.extend(_.extend({
@ -282,7 +283,7 @@ define([
menuCls : 'scrollable-menu',
menuStyle : 'min-width: 325px;',
hint : me.tipFontName,
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
store : new Common.Collections.Fonts()
});
me.paragraphControls.push(me.cmbFontName);
@ -291,7 +292,7 @@ define([
cls : 'input-group-nr',
menuStyle : 'min-width: 55px;',
hint : me.tipFontSize,
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
data : [
{ value: 8, displayValue: "8" },
{ value: 9, displayValue: "9" },
@ -317,7 +318,7 @@ define([
id : 'id-toolbar-btn-bold',
cls : 'btn-toolbar',
iconCls : 'btn-bold',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textBold + Common.Utils.String.platformKey('Ctrl+B'),
enableToggle: true
});
@ -327,7 +328,7 @@ define([
id : 'id-toolbar-btn-italic',
cls : 'btn-toolbar',
iconCls : 'btn-italic',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textItalic + Common.Utils.String.platformKey('Ctrl+I'),
enableToggle: true
});
@ -337,7 +338,7 @@ define([
id : 'id-toolbar-btn-underline',
cls : 'btn-toolbar',
iconCls : 'btn-underline',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textUnderline + Common.Utils.String.platformKey('Ctrl+U'),
enableToggle: true
});
@ -347,7 +348,7 @@ define([
id : 'id-toolbar-btn-strikeout',
cls : 'btn-toolbar',
iconCls : 'btn-strikeout',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textStrikeout,
enableToggle: true
});
@ -357,7 +358,7 @@ define([
id : 'id-toolbar-btn-superscript',
cls : 'btn-toolbar',
iconCls : 'btn-superscript',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textSuperscript,
enableToggle: true,
toggleGroup : 'superscriptGroup'
@ -368,7 +369,7 @@ define([
id : 'id-toolbar-btn-subscript',
cls : 'btn-toolbar',
iconCls : 'btn-subscript',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.textSubscript,
enableToggle: true,
toggleGroup : 'superscriptGroup'
@ -379,7 +380,7 @@ define([
id : 'id-toolbar-btn-fontcolor',
cls : 'btn-toolbar',
iconCls : 'btn-fontcolor',
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock : [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
hint : me.tipFontColor,
split : true,
menu : new Common.UI.Menu({

View file

@ -236,189 +236,18 @@
window.g_debug_mode = true;
</script>
<!-- sdk -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/States.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/HtmlPage.js"></script>
<script src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Presentation.js"></script>
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/slide/Editor/DrawingObjectsController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Slide.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/SlideMaster.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Layout.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Private/comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/Search.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
<!-- debug end -->
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!-- application -->
<script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>
</body>

View file

@ -60,13 +60,11 @@ Ext.define('PE.controller.Main', {
app = this.getApplication(),
profile = app.getCurrentProfile();
api = new Asc.asc_docs_api("id-sdkeditor");
api.SetMobileVersion(true);
api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/");
api = new Asc.asc_docs_api({
'id-view' : 'id-sdkeditor',
'mobile' : true
});
api.SetThemesPath("../../../../sdkjs/slide/themes/");
api.Init();
api.initEvents2MobileAdvances();
api.asc_registerCallback('asc_onStartAction', Ext.bind(this.onLongActionBegin, this));
api.asc_registerCallback('asc_onError', Ext.bind(this.onError, this));

View file

@ -214,179 +214,12 @@
<script type="text/javascript" src="app.js"></script>
<script type="text/javascript" src="../../common/locale.js"></script>
<!-- SDK -->
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script src="../../../../sdkjs/common/Drawings/States.js"></script>
<script src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Presentation.js"></script>
<script src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/slide/Editor/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Slide.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/SlideMaster.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Layout.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiExport.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Private/comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<!--for copy/paste from excel-->
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/Search.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/Locks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
</head>
<body>
<script type="text/javascript">

View file

@ -210,7 +210,7 @@
<!-- SDK -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/sdk-all-min.js"></script>
</head>
<body>
<script type="text/javascript">

View file

@ -0,0 +1,142 @@
var sdk_dev_scrpipts = [
"../../../../sdkjs/common/AllFonts.js",
"../../../../sdkjs/common/browser.js",
"../../../../sdkjs/common/commonDefines.js",
"../../../../sdkjs/common/downloaderfiles.js",
"../../../../sdkjs/common/docscoapicommon.js",
"../../../../sdkjs/common/docscoapi.js",
"../../../../sdkjs/common/apiCommon.js",
"../../../../sdkjs/common/SerializeCommonWordExcel.js",
"../../../../sdkjs/common/editorscommon.js",
"../../../../sdkjs/common/NumFormat.js",
"../../../../sdkjs/common/SerializeChart.js",
"../../../../sdkjs/common/AdvancedOptions.js",
"../../../../sdkjs/common/FontsFreeType/font_engine.js",
"../../../../sdkjs/common/FontsFreeType/FontFile.js",
"../../../../sdkjs/common/FontsFreeType/font_map.js",
"../../../../sdkjs/common/FontsFreeType/FontManager.js",
"../../../../sdkjs/common/Drawings/Metafile.js",
"../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
"../../../../sdkjs/common/Drawings/WorkEvents.js",
"../../../../sdkjs/word/Editor/History.js",
"../../../../sdkjs/common/Shapes/EditorSettings.js",
"../../../../sdkjs/common/Shapes/Serialize.js",
"../../../../sdkjs/common/Shapes/SerializeWriter.js",
"../../../../sdkjs/common/Drawings/Hit.js",
"../../../../sdkjs/common/Drawings/ArcTo.js",
"../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/Format/Constants.js",
"../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/common/Drawings/States.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js",
"../../../../sdkjs/common/Drawings/Format/GraphicObjectBase.js",
"../../../../sdkjs/common/Drawings/Format/Shape.js",
"../../../../sdkjs/slide/Editor/Format/ShapePrototype.js",
"../../../../sdkjs/common/Drawings/Format/Path.js",
"../../../../sdkjs/common/Drawings/Format/Image.js",
"../../../../sdkjs/common/Drawings/Format/GroupShape.js",
"../../../../sdkjs/common/Drawings/Format/ChartSpace.js",
"../../../../sdkjs/common/Drawings/Format/ChartFormat.js",
"../../../../sdkjs/common/Drawings/Format/TextBody.js",
"../../../../sdkjs/slide/Editor/Format/TextBodyPrototype.js",
"../../../../sdkjs/common/Drawings/Format/GraphicFrame.js",
"../../../../sdkjs/common/Charts/charts.js",
"../../../../sdkjs/common/Charts/DrawingArea.js",
"../../../../sdkjs/common/Charts/DrawingObjects.js",
"../../../../sdkjs/common/Charts/3DTransformation.js",
"../../../../sdkjs/common/Charts/ChartsDrawer.js",
"../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js",
"../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/Spline.js",
"../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js",
"../../../../sdkjs/common/Drawings/TextDrawer.js",
"../../../../sdkjs/common/Drawings/Externals.js",
"../../../../sdkjs/common/GlobalLoaders.js",
"../../../../sdkjs/common/CollaborativeEditingBase.js",
"../../../../sdkjs/common/Controls.js",
"../../../../sdkjs/common/Overlay.js",
"../../../../sdkjs/common/Drawings/HatchPattern.js",
"../../../../sdkjs/common/scroll.js",
"../../../../sdkjs/common/wordcopypaste.js",
"../../../../sdkjs/slide/apiDefines.js",
"../../../../sdkjs/slide/themes/Themes.js",
"../../../../sdkjs/cell/utils/utils.js",
"../../../../sdkjs/cell/model/WorkbookElems.js",
"../../../../sdkjs/cell/model/Workbook.js",
"../../../../sdkjs/cell/model/Serialize.js",
"../../../../sdkjs/cell/model/CellInfo.js",
"../../../../sdkjs/cell/view/DrawingObjectsController.js",
"../../../../sdkjs/slide/Drawing/ThemeLoader.js",
"../../../../sdkjs/word/Editor/Serialize2.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/slide/Editor/CollaborativeEditing.js",
"../../../../sdkjs/word/Drawing/GraphicsEvents.js",
"../../../../sdkjs/word/Drawing/Rulers.js",
"../../../../sdkjs/word/Editor/Table.js",
"../../../../sdkjs/word/Editor/Table/TableRecalculate.js",
"../../../../sdkjs/word/Editor/Table/TableDraw.js",
"../../../../sdkjs/word/Editor/Table/TableRow.js",
"../../../../sdkjs/word/Editor/Table/TableCell.js",
"../../../../sdkjs/word/Editor/Common.js",
"../../../../sdkjs/word/Editor/Sections.js",
"../../../../sdkjs/word/Editor/Styles.js",
"../../../../sdkjs/slide/Editor/Format/StylesPrototype.js",
"../../../../sdkjs/word/Drawing/Graphics.js",
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
"../../../../sdkjs/slide/Drawing/Transitions.js",
"../../../../sdkjs/slide/Drawing/DrawingDocument.js",
"../../../../sdkjs/slide/Drawing/HtmlPage.js",
"../../../../sdkjs/slide/Editor/Format/Presentation.js",
"../../../../sdkjs/slide/Editor/DrawingObjectsController.js",
"../../../../sdkjs/slide/Editor/Format/Slide.js",
"../../../../sdkjs/slide/Editor/Format/SlideMaster.js",
"../../../../sdkjs/slide/Editor/Format/Layout.js",
"../../../../sdkjs/slide/Editor/Format/Comments.js",
"../../../../sdkjs/word/Editor/ParagraphContent.js",
"../../../../sdkjs/word/Editor/Paragraph.js",
"../../../../sdkjs/word/Editor/DocumentContentBase.js",
"../../../../sdkjs/word/Editor/Document.js",
"../../../../sdkjs/word/Editor/DocumentContent.js",
"../../../../sdkjs/slide/apiCommon.js",
"../../../../sdkjs/common/apiBase.js",
"../../../../sdkjs/slide/api.js",
"../../../../sdkjs/common/Private/license.js",
"../../../../sdkjs/slide/Private/comments.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/word/Editor/ParagraphContentBase.js",
"../../../../sdkjs/word/Editor/Hyperlink.js",
"../../../../sdkjs/word/Editor/Field.js",
"../../../../sdkjs/word/Editor/Run.js",
"../../../../sdkjs/word/Math/mathTypes.js",
"../../../../sdkjs/word/Math/mathText.js",
"../../../../sdkjs/word/Math/mathContent.js",
"../../../../sdkjs/word/Math/base.js",
"../../../../sdkjs/word/Math/fraction.js",
"../../../../sdkjs/word/Math/degree.js",
"../../../../sdkjs/word/Math/matrix.js",
"../../../../sdkjs/word/Math/limit.js",
"../../../../sdkjs/word/Math/nary.js",
"../../../../sdkjs/word/Math/radical.js",
"../../../../sdkjs/word/Math/operators.js",
"../../../../sdkjs/word/Math/accent.js",
"../../../../sdkjs/word/Math/borderBox.js",
"../../../../sdkjs/word/Editor/FlowObjects.js",
"../../../../sdkjs/word/Editor/Paragraph_Recalculate.js",
"../../../../sdkjs/word/Editor/HeaderFooter.js",
"../../../../sdkjs/word/Editor/Math.js",
"../../../../sdkjs/word/Editor/Spelling.js",
"../../../../sdkjs/word/Editor/Search.js",
"../../../../sdkjs/word/Editor/FontClassification.js",
"../../../../sdkjs/slide/Editor/Format/ImagePrototype.js",
"../../../../sdkjs/slide/Editor/Format/GroupPrototype.js",
"../../../../sdkjs/slide/Editor/Format/ChartSpacePrototype.js",
"../../../../sdkjs/common/Private/Locks.js",
"../../../../sdkjs/word/apiCommon.js",
"../../../../sdkjs/common/applyDocumentChanges.js"
];

View file

@ -302,193 +302,12 @@
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
<!--sdk-->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/autofilters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/DrawingContext.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/pdfprinter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/document/empty-workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellEditorView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/HandlerList.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/EventsController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorkbookView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/Private/comments.js"></script>
<!--for theme-->
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<!--for chart-->
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<!--for shapes-->
<script src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script src="../../../../sdkjs/common/Drawings/States.js"></script>
<script src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script src="../../../../sdkjs/common/Controls.js"></script>
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Overlay.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>
<script src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/Table.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<script src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!--application-->
<script type="text/javascript" src="../../common/Gateway.js"></script>

View file

@ -297,7 +297,7 @@
<!--sdk-->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/sdk-all-min.js"></script>
<!--application-->
<link href="../../../apps/spreadsheeteditor/embed/resources/css/app-all.css" rel="stylesheet">

View file

@ -688,11 +688,11 @@ var ApplicationController = new(function(){
}, 2000);
});
api = new Asc.spreadsheet_api("editor_sdk");
api = new Asc.spreadsheet_api({
'id-view': 'editor_sdk'
});
if (api){
api.asc_SetFontsPath("../../../../sdkjs/fonts/");
api.asc_registerCallback('asc_onStartAction', onLongActionBegin);
api.asc_registerCallback('asc_onEndAction', onLongActionEnd);
api.asc_registerCallback('asc_onError', onError);

View file

@ -57,7 +57,7 @@ require.config({
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',

View file

@ -100,6 +100,11 @@ define([
return this;
},
setMode: function(mode) {
this.mode = mode;
return this;
},
onLaunch: function () {
this.formulasGroups = this.getApplication().getCollection('FormulaGroups');
},
@ -132,6 +137,11 @@ define([
allFunctionsGroup = null;
if (store) {
var value = Common.localStorage.getItem("sse-settings-func-locale");
if (value===null)
value = ((this.mode.lang) ? this.mode.lang : 'en').split("-")[0].toLowerCase();
value = SSE.Views.FormulaLang.getDescription(value);
allFunctionsGroup = new SSE.Models.FormulaGroup ({
name : 'All',
index : index,
@ -160,11 +170,13 @@ define([
functions = [];
for (j = 0; j < ascFunctions.length; j += 1) {
var funcname = ascFunctions[j].asc_getName();
var func = new SSE.Models.FormulaModel({
index : funcInd,
group : ascGroupName,
name : ascFunctions[j].asc_getName(),
args : ascFunctions[j].asc_getArguments()
name : ascFunctions[j].asc_getLocaleName(),
args : (value && value[funcname]) ? value[funcname].a : '',
desc : (value && value[funcname]) ? value[funcname].d : ''
});
funcInd += 1;

View file

@ -90,10 +90,6 @@ define([
},
onLaunch: function() {
/** coauthoring begin **/
window.asc_CCommentData = window.Asc.asc_CCommentData||window.asc_CCommentData;
/** coauthoring end **/
// $(document.body).css('position', 'absolute');
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, startModifyDocument: true, lostEditingRights: false, licenseWarning: false};
@ -111,9 +107,11 @@ define([
if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3';
// Initialize api
this.api = new Asc.spreadsheet_api("editor_sdk", "ce-cell-content");
this.api = new Asc.spreadsheet_api({
'id-view' : 'editor_sdk',
'id-input' : 'ce-cell-content'
});
this.api.asc_setFontRenderingMode(parseInt(value));
this.api.asc_SetFontsPath("../../../../sdkjs/fonts/");
this.api.asc_registerCallback('asc_onOpenDocumentProgress', _.bind(this.onOpenDocument, this));
this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this));
@ -513,11 +511,14 @@ define([
application.getController('Statusbar').getView('Statusbar').update();
application.getController('CellEditor').setMode(me.appOptions);
me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me));
me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me));
me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
me.api.asc_registerCallback('asc_onDocumentCanSaveChanged', _.bind(me.onDocumentCanSaveChanged, me));
me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me));
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
me.fillTextArt(me.api.asc_getTextArtPreviews());
me.updateThemeColors();
@ -631,7 +632,10 @@ define([
rightmenuController.createDelayedElements();
if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me));
var shapes = me.api.asc_getPropertyEditorShapes();
if (shapes)
me.fillAutoShapes(shapes[0], shapes[1]);
me.fillTextArt(me.api.asc_getTextArtPreviews());
me.updateThemeColors();
}
@ -645,7 +649,7 @@ define([
var formulasDlgController = application.getController('FormulaDialog');
if (formulasDlgController) {
formulasDlgController.setApi(me.api);
formulasDlgController.setMode(me.appOptions).setApi(me.api);
}
if (me.needToUpdateVersion)
toolbarController.onApiCoAuthoringDisconnect();
@ -670,8 +674,6 @@ define([
if (!window['AscDesktopEditor']) {
var tips = [];
Common.Utils.isIE9m && tips.push(me.warnBrowserIE9);
!Common.Utils.isGecko && !me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.nativeApp &&
(Math.abs(me.getBrowseZoomLevel() - 1) > 0.1) && tips.push(Common.Utils.String.platformKey(me.warnBrowserZoom, '{0}'));
if (tips.length) me.showTips(tips);
}
@ -1148,20 +1150,6 @@ define([
this._state.isDisconnected = true;
},
getBrowseZoomLevel: function() {
if (Common.Utils.isIE) {
return screen.logicalXDPI/screen.deviceXDPI;
} else {
var zoom = window.outerWidth / document.documentElement.clientWidth;
if (Common.Utils.isSafari) {
zoom = Math.floor(zoom * 10) / 10;
}
return zoom;
}
},
showTips: function(strings) {
var me = this;
if (!strings.length) return;
@ -1347,8 +1335,8 @@ define([
},
onConfirmAction: function(id, apiCallback) {
if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) {
var me = this;
if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) {
Common.UI.warning({
closable: false,
title: this.notcriticalErrorTitle,
@ -1364,6 +1352,20 @@ define([
}
}, this)
});
} else if (id == Asc.c_oAscConfirm.ConfirmPutMergeRange) {
Common.UI.warning({
closable: false,
title: this.notcriticalErrorTitle,
msg: this.confirmPutMergeRange,
buttons: ['ok'],
primary: 'ok',
callback: _.bind(function(btn) {
if (apiCallback) {
apiCallback();
}
me.onEditComplete(me.application.getController('DocumentHolder').getView('DocumentHolder'));
}, this)
});
}
},
@ -1785,7 +1787,8 @@ define([
textBuyNow: 'Buy now',
textNoLicenseTitle: 'License expired or not found',
warnNoLicense: 'The license could not be found or expired. You cannot edit files.<br>Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.',
textContactUs: 'Contact us'
textContactUs: 'Contact us',
confirmPutMergeRange: 'The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.'
}
})(), SSE.Controllers.Main || {}))
});

View file

@ -117,10 +117,9 @@ define([
this._openRightMenu = true;
}
this.onFocusObject(SelectedObjects, formatTableInfo);
var need_disable = info.asc_getLocked();
var need_disable = info.asc_getLocked(),
me = this;
this.onFocusObject(SelectedObjects, formatTableInfo, need_disable);
if (this._state.prevDisabled != need_disable) {
this._state.prevDisabled = need_disable;
@ -130,7 +129,7 @@ define([
}
},
onFocusObject: function(SelectedObjects, formatTableInfo) {
onFocusObject: function(SelectedObjects, formatTableInfo, isCellLocked) {
if (!this.editMode)
return;
@ -171,6 +170,7 @@ define([
if (formatTableInfo) {
settingsType = Common.Utils.documentSettingsType.Table;
this._settings[settingsType].props = formatTableInfo;
this._settings[settingsType].locked = isCellLocked;
this._settings[settingsType].hidden = 0;
}

View file

@ -56,7 +56,7 @@ define([
_options = {};
_.extend(_options, {
width : 300,
width : 310,
height : 490,
contentWidth : 390,
header : true,
@ -75,7 +75,8 @@ define([
'<label class="header" style="margin-top:10px">' + t.textListDescription + '</label>',
'<div id="formula-dlg-combo-functions" class="combo-functions"/>',
'<label id="formula-dlg-args" style="margin-top: 10px">' + '</label>',
'<label id="formula-dlg-args" style="margin-top: 7px">' + '</label>',
'<label id="formula-dlg-desc" style="margin-top: 4px">' + '</label>',
'</div>',
'</div>',
@ -101,6 +102,7 @@ define([
this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.syntaxLabel = $('#formula-dlg-args');
this.descLabel = $('#formula-dlg-desc');
this.translationTable = {};
@ -201,6 +203,7 @@ define([
if (func) {
this.applyFunction = func.get('name');
this.syntaxLabel.text(this.applyFunction + func.get('args'));
this.descLabel.text(func.get('desc'));
}
}
}
@ -299,6 +302,7 @@ define([
this.applyFunction = functions[0].get('name');
this.syntaxLabel.text(this.applyFunction + functions[0].get('args'));
this.descLabel.text(functions[0].get('desc'));
this.cmbListFunctions.scroller.update({
minScrollbarLength : 40,
alwaysVisibleY : true

View file

@ -37,7 +37,8 @@ define([
SSE.Views = SSE.Views || {};
SSE.Views.FormulaLang = new(function() {
var langJson = {};
var langJson = {},
langDescJson = {};
var _createXMLHTTPObject = function() {
var xmlhttp;
@ -82,8 +83,40 @@ define([
return null;
};
var _getDescription = function(lang) {
if (!lang) return '';
lang = lang.toLowerCase() ;
if (langDescJson[lang])
return langDescJson[lang];
else {
try {
var xhrObj = _createXMLHTTPObject();
if (xhrObj && lang) {
xhrObj.open('GET', 'resources/formula-lang/' + lang + '_desc.json', false);
xhrObj.send('');
if (xhrObj.status == 200)
langDescJson[lang] = eval("(" + xhrObj.responseText + ")");
else {
xhrObj.open('GET', 'resources/formula-lang/en_desc.json', false);
xhrObj.send('');
langDescJson[lang] = eval("(" + xhrObj.responseText + ")");
}
return langDescJson[lang];
}
}
catch (e) {
}
}
return null;
};
return {
get: _get
get: _get,
getDescription: _getDescription
};
})();
});

View file

@ -328,8 +328,8 @@ define([
this.chFilter.setValue(value, true);
this._state.CheckFilter=value;
}
if (this.chFilter.isDisabled() == this._state.CheckHeader)
this.chFilter.setDisabled(!this._state.CheckHeader);
if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked))
this.chFilter.setDisabled(!this._state.CheckHeader || this._locked);
if (needTablePictures)
this.onApiInitTableTemplates(this.api.asc_getTablePictures(props));

View file

@ -587,7 +587,6 @@ define([
if (this.api) {
this.api.asc_setInterfaceDrawImagePlaceTextArt('textart-texture-img');
this.api.asc_registerCallback('asc_onInitStandartTextures', _.bind(this.onInitStandartTextures, this));
this.api.asc_registerCallback('asc_onInitEditorTextArts', _.bind(this.fillTransform, this));
}
return this;
},
@ -1504,6 +1503,7 @@ define([
}
this.UpdateThemeColors();
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
},
onInitStandartTextures: function(texture) {

View file

@ -230,208 +230,26 @@
</script>
<div id="viewport"></div>
<!-- sdk -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<!--<script type="text/javascript" src="../../../../sdkjs/cell/sdk-all.js"></script>-->
<script type="text/javascript">
window.g_debug_mode = true;
</script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/States.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/autofilters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/DrawingContext.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/pdfprinter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/document/empty-workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellEditorView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/HandlerList.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/EventsController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorkbookView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/Private/comments.js"></script>
<!--for chart-->
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<!--for shapes-->
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/Table.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
<!-- debug end -->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
<!-- application -->
<script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>

View file

@ -112,6 +112,7 @@
"SSE.Controllers.LeftMenu.textWorkbook": "Workbook",
"SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
"SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?",
"SSE.Controllers.Main.confirmPutMergeRange": "The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.",
"SSE.Controllers.Main.convertationErrorText": "Conversion failed.",
"SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -2,7 +2,7 @@
.combo-functions {
width: 100%;
height: 242px;
height: 184px;
overflow: hidden;
}

View file

@ -64,9 +64,10 @@ Ext.define('SSE.controller.Main', {
var app = this.getApplication();
// Initialize api
this.api = new Asc.spreadsheet_api("id-sdkeditor", "", SSE.controller.ApiEvents, {}, {});
this.api.asc_SetFontsPath("../../../../sdkjs/fonts/");
this.api.asc_setMobileVersion(true);
this.api = new Asc.spreadsheet_api({
'id-view' : 'id-sdkeditor',
'mobile' : true
});
this.api.asc_registerCallback('asc_onAdvancedOptions', Ext.bind(this.onAdvancedOptions, this));
this.api.asc_registerCallback('asc_onOpenDocumentProgress', Ext.bind(this.onOpenDocumentProgress, this));

View file

@ -62,19 +62,30 @@ Ext.define('SSE.controller.Search', {
setApi: function(o) {
this.api = o;
this.findOptions = new Asc.asc_CFindOptions();
this.findOptions.asc_setScanForward(true);
this.findOptions.asc_setIsMatchCase(false);
this.findOptions.asc_setIsWholeCell(false);
this.findOptions.asc_setScanOnOnlySheet(true);
this.findOptions.asc_setScanByRows(true);
this.findOptions.asc_setLookIn(Asc.c_oAscFindLookIn.Formulas);
},
onNextResult: function(){
var searchField = this.getSearchField();
if (this.api && searchField){
this.api.asc_findText(searchField.getValue(), true, true);
this.findOptions.asc_setFindWhat(searchField.getValue());
this.findOptions.asc_setScanForward(true);
this.api.asc_findText(this.findOptions);
}
},
onPreviousResult: function(){
var searchField = this.getSearchField();
if (this.api && searchField){
this.api.asc_findText(searchField.getValue(), true, false);
this.findOptions.asc_setFindWhat(searchField.getValue());
this.findOptions.asc_setScanForward(false);
this.api.asc_findText(this.findOptions);
}
},
@ -83,7 +94,9 @@ Ext.define('SSE.controller.Search', {
searchField = this.getSearchField();
if (keyCode == 13 && this.api) {
this.api.asc_findText(searchField.getValue(), true, true);
this.findOptions.asc_setFindWhat(searchField.getValue());
this.findOptions.asc_setScanForward(true);
this.api.asc_findText(this.findOptions);
}
this.updateNavigation();
},

View file

@ -170,7 +170,7 @@
</style>
<!-- vendor -->
<!-- sdk -->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main-mobile.css"/>
<script type="text/javascript" src="../../../vendor/touch/sencha-touch-debug.js"></script>
@ -221,192 +221,12 @@
window.g_debug_mode = true;
</script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/autofilters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/DrawingContext.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/graphics/pdfprinter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/document/empty-workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Workbook.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellEditorView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorksheetView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/HandlerList.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/EventsController.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/WorkbookView.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/iscroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/api.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/Private/comments.js"></script>
<!--for theme-->
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
<!--for chart-->
<script type="text/javascript" src="../../../../sdkjs/common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/SerializeChart.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<!--for shapes-->
<script src="../../../../sdkjs/common/Drawings/Hit.js"></script>
<script src="../../../../sdkjs/common/Drawings/States.js"></script>
<script src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
<script src="../../../../sdkjs/common/Drawings/CommonController.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/CreateGeometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Geometry.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Path.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartSpace.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/ChartFormat.js"></script>
<script src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
<script src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script src="../../../../sdkjs/common/Controls.js"></script>
<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Overlay.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>
<script src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js"></script>
<script src="../../../../sdkjs/slide/Editor/Format/GraphicFrame.js"></script>
<script src="../../../../sdkjs/word/Editor/Comments.js"></script>
<script src="../../../../sdkjs/word/Editor/Styles.js"></script>
<script src="../../../../sdkjs/word/Editor/FlowObjects.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContent.js"></script>
<script src="../../../../sdkjs/word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../sdkjs/word/Editor/Hyperlink.js"></script>
<script src="../../../../sdkjs/word/Editor/Field.js"></script>
<script src="../../../../sdkjs/word/Editor/Run.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Sections.js"></script>
<script src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/Table.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableRow.js"></script>
<script src="../../../../sdkjs/word/Editor/Table/TableCell.js"></script>
<script src="../../../../sdkjs/word/Editor/Serialize2.js"></script>
<script src="../../../../sdkjs/word/Editor/FontClassification.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
<script src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
<script src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
<script src="../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathText.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/mathContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/base.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/fraction.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/degree.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/matrix.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/limit.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/nary.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/radical.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/operators.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Math/borderBox.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../../../../sdkjs/common/applyDocumentChanges.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>
</head>
<body>
<script type="text/javascript">

View file

@ -185,7 +185,7 @@
<!-- SDK -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/sdk-all.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/sdk-all-min.js"></script>
<!-- Application -->

View file

@ -0,0 +1,157 @@
var sdk_dev_scrpipts = [
"../../../../sdkjs/common/AllFonts.js",
"../../../../sdkjs/common/browser.js",
"../../../../sdkjs/common/commonDefines.js",
"../../../../sdkjs/common/downloaderfiles.js",
"../../../../sdkjs/common/docscoapicommon.js",
"../../../../sdkjs/common/docscoapi.js",
"../../../../sdkjs/common/apiCommon.js",
"../../../../sdkjs/common/SerializeCommonWordExcel.js",
"../../../../sdkjs/common/editorscommon.js",
"../../../../sdkjs/common/NumFormat.js",
"../../../../sdkjs/common/SerializeChart.js",
"../../../../sdkjs/common/AdvancedOptions.js",
"../../../../sdkjs/common/FontsFreeType/font_engine.js",
"../../../../sdkjs/common/FontsFreeType/FontFile.js",
"../../../../sdkjs/common/FontsFreeType/font_map.js",
"../../../../sdkjs/common/FontsFreeType/FontManager.js",
"../../../../sdkjs/common/Drawings/Metafile.js",
"../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
"../../../../sdkjs/common/Drawings/WorkEvents.js",
"../../../../sdkjs/cell/model/History.js",
"../../../../sdkjs/common/Shapes/EditorSettings.js",
"../../../../sdkjs/common/Shapes/Serialize.js",
"../../../../sdkjs/common/Shapes/SerializeWriter.js",
"../../../../sdkjs/common/Drawings/Hit.js",
"../../../../sdkjs/common/Drawings/ArcTo.js",
"../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/Format/Constants.js",
"../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/common/Drawings/States.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js",
"../../../../sdkjs/common/Drawings/Format/GraphicObjectBase.js",
"../../../../sdkjs/common/Drawings/Format/Shape.js",
"../../../../sdkjs/common/Drawings/Format/Path.js",
"../../../../sdkjs/common/Drawings/Format/Image.js",
"../../../../sdkjs/common/Drawings/Format/GroupShape.js",
"../../../../sdkjs/common/Drawings/Format/ChartSpace.js",
"../../../../sdkjs/common/Drawings/Format/ChartFormat.js",
"../../../../sdkjs/common/Drawings/Format/TextBody.js",
"../../../../sdkjs/common/Drawings/Format/GraphicFrame.js",
"../../../../sdkjs/common/Charts/charts.js",
"../../../../sdkjs/common/Charts/DrawingArea.js",
"../../../../sdkjs/common/Charts/DrawingObjects.js",
"../../../../sdkjs/common/Charts/3DTransformation.js",
"../../../../sdkjs/common/Charts/ChartsDrawer.js",
"../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js",
"../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js",
"../../../../sdkjs/common/Drawings/TrackObjects/Spline.js",
"../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js",
"../../../../sdkjs/common/Drawings/TextDrawer.js",
"../../../../sdkjs/common/Drawings/Externals.js",
"../../../../sdkjs/common/GlobalLoaders.js",
"../../../../sdkjs/common/CollaborativeEditingBase.js",
"../../../../sdkjs/common/Controls.js",
"../../../../sdkjs/common/Overlay.js",
"../../../../sdkjs/common/Drawings/HatchPattern.js",
"../../../../sdkjs/common/scroll.js",
"../../../../sdkjs/cell/view/iscroll.js",
"../../../../sdkjs/common/wordcopypaste.js",
"../../../../sdkjs/cell/apiDefines.js",
"../../../../sdkjs/cell/document/empty-workbook.js",
"../../../../sdkjs/cell/utils/utils.js",
"../../../../sdkjs/cell/model/UndoRedo.js",
"../../../../sdkjs/cell/model/clipboard.js",
"../../../../sdkjs/cell/model/autofilters.js",
"../../../../sdkjs/cell/graphics/DrawingContext.js",
"../../../../sdkjs/cell/graphics/pdfprinter.js",
"../../../../sdkjs/cell/model/CollaborativeEditing.js",
"../../../../sdkjs/cell/model/ConditionalFormatting.js",
"../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js",
"../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js",
"../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js",
"../../../../sdkjs/cell/model/CellComment.js",
"../../../../sdkjs/cell/model/WorkbookElems.js",
"../../../../sdkjs/cell/model/Workbook.js",
"../../../../sdkjs/cell/model/Serialize.js",
"../../../../sdkjs/cell/model/CellInfo.js",
"../../../../sdkjs/cell/view/mobileTouch.js",
"../../../../sdkjs/cell/view/DrawingObjectsController.js",
"../../../../sdkjs/cell/view/StringRender.js",
"../../../../sdkjs/cell/view/CellTextRender.js",
"../../../../sdkjs/cell/view/CellEditorView.js",
"../../../../sdkjs/cell/view/HandlerList.js",
"../../../../sdkjs/cell/view/EventsController.js",
"../../../../sdkjs/cell/view/WorkbookView.js",
"../../../../sdkjs/cell/view/WorksheetView.js",
"../../../../sdkjs/cell/model/DrawingObjects/Graphics.js",
"../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js",
"../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js",
"../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js",
"../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js",
"../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js",
"../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js",
"../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js",
"../../../../sdkjs/common/apiBase.js",
"../../../../sdkjs/cell/api.js",
"../../../../sdkjs/common/Private/license.js",
"../../../../sdkjs/cell/Private/comments.js",
"../../../../sdkjs/word/Editor/Common.js",
"../../../../sdkjs/word/Editor/Comments.js",
"../../../../sdkjs/word/Editor/Styles.js",
"../../../../sdkjs/word/Editor/ParagraphContent.js",
"../../../../sdkjs/word/Editor/Paragraph.js",
"../../../../sdkjs/word/Editor/DocumentContentBase.js",
"../../../../sdkjs/word/Editor/Document.js",
"../../../../sdkjs/word/Editor/DocumentContent.js",
"../../../../sdkjs/word/Editor/FlowObjects.js",
"../../../../sdkjs/word/Editor/ParagraphContentBase.js",
"../../../../sdkjs/word/Editor/Hyperlink.js",
"../../../../sdkjs/word/Editor/Field.js",
"../../../../sdkjs/word/Editor/Run.js",
"../../../../sdkjs/word/Editor/Math.js",
"../../../../sdkjs/word/Editor/Paragraph_Recalculate.js",
"../../../../sdkjs/word/Editor/Sections.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/word/Editor/HeaderFooter.js",
"../../../../sdkjs/word/Editor/Table.js",
"../../../../sdkjs/word/Editor/Table/TableRecalculate.js",
"../../../../sdkjs/word/Editor/Table/TableDraw.js",
"../../../../sdkjs/word/Editor/Table/TableRow.js",
"../../../../sdkjs/word/Editor/Table/TableCell.js",
"../../../../sdkjs/word/Editor/Serialize2.js",
"../../../../sdkjs/word/Editor/FontClassification.js",
"../../../../sdkjs/word/Editor/Spelling.js",
"../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js",
"../../../../sdkjs/word/Math/mathTypes.js",
"../../../../sdkjs/word/Math/mathText.js",
"../../../../sdkjs/word/Math/mathContent.js",
"../../../../sdkjs/word/Math/base.js",
"../../../../sdkjs/word/Math/fraction.js",
"../../../../sdkjs/word/Math/degree.js",
"../../../../sdkjs/word/Math/matrix.js",
"../../../../sdkjs/word/Math/limit.js",
"../../../../sdkjs/word/Math/nary.js",
"../../../../sdkjs/word/Math/radical.js",
"../../../../sdkjs/word/Math/operators.js",
"../../../../sdkjs/word/Math/accent.js",
"../../../../sdkjs/word/Math/borderBox.js",
"../../../../sdkjs/word/apiCommon.js",
"../../../../sdkjs/common/applyDocumentChanges.js"
];

View file

@ -1,7 +1,7 @@
{
"name": "documenteditor",
"version": "4.6.0",
"build": 1054,
"build": 1064,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {
@ -22,8 +22,9 @@
"dest": "../deploy/sdkjs/common/"
},
{
"src": "../../sdkjs/word/sdk-all.js",
"dest": "../deploy/sdkjs/word/sdk-all.js"
"expand": true,
"src": "../../sdkjs/word/sdk-*.js",
"dest": "../deploy/sdkjs/word/"
}
]
}
@ -39,6 +40,7 @@
"cwd": "../apps/api/",
"src": [
"**",
"!**/*.html",
"!**/*.desktop"
],
"dest": "../deploy/web-apps/apps/api/"

View file

@ -1,7 +1,7 @@
{
"name": "presentationeditor",
"version": "4.6.0",
"build": 762,
"build": 771,
"homepage": "http://www.onlyoffice.com",
"sdk": {
"clean": [
@ -27,8 +27,9 @@
"dest": "../deploy/sdkjs/slide/themes/"
},
{
"src": "../../sdkjs/slide/sdk-all.js",
"dest": "../deploy/sdkjs/slide/sdk-all.js"
"expand": true,
"src": "../../sdkjs/slide/sdk-*.js",
"dest": "../deploy/sdkjs/slide/"
}
]
}

View file

@ -1,7 +1,7 @@
{
"name": "spreadsheeteditor",
"version": "4.6.0",
"build": 865,
"build": 874,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {
@ -34,8 +34,9 @@
"dest": "../deploy/sdkjs/word/Images/"
},
{
"src": "../../sdkjs/cell/sdk-all.js",
"dest": "../deploy/sdkjs/cell/sdk-all.js"
"expand": true,
"src": "../../sdkjs/cell/sdk-*.js",
"dest": "../deploy/sdkjs/cell/"
}
]
}