',
- '',
- '<% if (variations.length>1) { %>',
- '',
- '<% } %>',
- '<%= name %>',
- '
'
- ].join(''))
- });
- this.lockedControls.push(this.viewPluginsList);
- this.viewPluginsList.cmpEl.off('click');
+ // this.viewPluginsList = new Common.UI.DataView({
+ // el: $('#plugins-list'),
+ // store: this.storePlugins,
+ // enableKeyEvents: false,
+ // itemTemplate: _.template([
+ // '',
+ // '',
+ // '<% if (variations.length>1) { %>',
+ // '',
+ // '<% } %>',
+ // '<%= name %>',
+ // '
'
+ // ].join(''))
+ // });
+ // this.lockedControls.push(this.viewPluginsList);
+ // this.viewPluginsList.cmpEl.off('click');
this.pluginName = $('#current-plugin-header label');
this.pluginsPanel = $('#plugins-box');
diff --git a/apps/common/mobile/resources/img/header/header-logo.png b/apps/common/mobile/resources/img/header/header-logo.png
new file mode 100644
index 000000000..bace6a100
Binary files /dev/null and b/apps/common/mobile/resources/img/header/header-logo.png differ
diff --git a/apps/common/mobile/resources/img/header/header-logo@2x.png b/apps/common/mobile/resources/img/header/header-logo@2x.png
new file mode 100644
index 000000000..57644434a
Binary files /dev/null and b/apps/common/mobile/resources/img/header/header-logo@2x.png differ
diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index 7b276bdb1..71e53a6d1 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -15,170 +15,94 @@
@@ -232,50 +157,19 @@
.replace(/>/g, '>');
}
- var params = getUrlParams(),
- lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('' +
- '
');
+ var elem = document.querySelector('.loading-logo');
+ if (elem && logo) {
+ elem.style.backgroundImage= 'none';
+ var img = document.querySelector('.loading-logo img');
+ img && img.setAttribute('src', logo);
+ img.style.opacity = 1;
+ }
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy
index f66c00573..8e30b2c8e 100644
--- a/apps/documenteditor/embed/index.html.deploy
+++ b/apps/documenteditor/embed/index.html.deploy
@@ -13,168 +13,93 @@
@@ -184,6 +109,7 @@
+ ' +
- ((logo!==null) ? logo :
- '
' +
- '' +
- '' +
- '' +
- '' +
- '
') +
- '' + customer +
- '
' +
- '' + loading + '
' +
- '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/documenteditor/embed/index_loader.html.deploy b/apps/documenteditor/embed/index_loader.html.deploy
new file mode 100644
index 000000000..bac45e2be
--- /dev/null
+++ b/apps/documenteditor/embed/index_loader.html.deploy
@@ -0,0 +1,355 @@
+
+
+
+
+ Please wait...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 236ae58aa..002792ba4 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -97,38 +97,9 @@ define([
'settings:apply': _.bind(this.applySettings, this)
}
});
- },
- onLaunch: function() {
- var me = this;
-
- this.stackLongActions = new Common.IrregularStack({
- strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;},
- weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
- });
-
- this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
- this.languages = null;
- this.translationTable = [];
- this.isModalShowed = 0;
- // Initialize viewport
-
- if (!Common.Utils.isBrowserSupported()){
- Common.Utils.showBrowserRestriction();
- Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText);
- return;
- }
-
- var value = Common.localStorage.getItem("de-settings-fontrender");
- if (value === null)
- window.devicePixelRatio > 1 ? value = '1' : '0';
- Common.Utils.InternalSettings.set("de-settings-fontrender", value);
-
- // Initialize api
-
- window["flat_desine"] = true;
-
- var styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
+ var me = this,
+ styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text'],
translate = {
'Series': this.txtSeries,
@@ -164,16 +135,39 @@ define([
"Hyperlink": this.txtHyperlink
};
styleNames.forEach(function(item){
- translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
});
- me.translationTable['Header'] = this.txtHeader;
- me.translationTable['Footer'] = this.txtFooter;
+ me.translationTable = translate;
+ },
- this.api = new Asc.asc_docs_api({
- 'id-view' : 'editor_sdk',
- 'translate': translate
+ onLaunch: function() {
+ var me = this;
+
+ this.stackLongActions = new Common.IrregularStack({
+ strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;},
+ weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
});
+ this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
+ this.languages = null;
+ this.isModalShowed = 0;
+ // Initialize viewport
+
+ if (!Common.Utils.isBrowserSupported()){
+ Common.Utils.showBrowserRestriction();
+ Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText);
+ return;
+ }
+
+ var value = Common.localStorage.getItem("de-settings-fontrender");
+ if (value === null)
+ window.devicePixelRatio > 1 ? value = '1' : '0';
+ Common.Utils.InternalSettings.set("de-settings-fontrender", value);
+
+ // Initialize api
+ window["flat_desine"] = true;
+ this.api = this.getApplication().getController('Viewport').getApi();
+
if (this.api){
this.api.SetDrawingFreeze(true);
switch (value) {
@@ -365,6 +359,9 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
+ if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo))
+ $('#editor_sdk').append('Please wait...
+ ' + ''.repeat(20) + '
');
+
Common.Controllers.Desktop.init(this.appOptions);
},
@@ -1026,7 +1023,6 @@ define([
if (me.needToUpdateVersion)
toolbarController.onApiCoAuthoringDisconnect();
me.api.UpdateInterfaceState();
- me.fillTextArt(me.api.asc_getTextArtPreviews());
Common.NotificationCenter.trigger('document:ready', 'main');
me.applyLicense();
@@ -1051,6 +1047,8 @@ define([
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
Common.Gateway.documentReady();
+
+ $('.doc-placeholder').remove();
},
onLicenseChanged: function(params) {
@@ -1809,25 +1807,25 @@ define([
shapeStore.reset();
- var groupscount = groupNames.length;
_.each(groupNames, function(groupName, index){
var store = new Backbone.Collection([], {
model: DE.Models.ShapeModel
- });
+ }),
+ arr = [];
var cols = (shapes[index].length) > 18 ? 7 : 6,
height = Math.ceil(shapes[index].length/cols) * 35 + 3,
width = 30 * cols;
_.each(shapes[index], function(shape, idx){
- store.add({
+ arr.push({
data : {shapeType: shape.Type},
tip : me['txtShape_' + shape.Type] || (me.textShape + ' ' + (idx+1)),
allowSelected : true,
selected: false
});
});
-
+ store.add(arr);
shapegrouparray.push({
groupName : me.shapeGroupNames[index],
groupStore : store,
@@ -1837,19 +1835,20 @@ define([
});
shapeStore.add(shapegrouparray);
-
setTimeout(function(){
- me.getApplication().getController('Toolbar').fillAutoShapes();
+ me.getApplication().getController('Toolbar').onApiAutoShapes();
}, 50);
-
},
fillTextArt: function(shapes){
- if (_.isEmpty(shapes)) return;
-
- var me = this, arr = [],
+ var arr = [],
artStore = this.getCollection('Common.Collections.TextArt');
+ if (!shapes && artStore.length>0) {// shapes == undefined when update textart collection (from asc_onSendThemeColors)
+ shapes = this.api.asc_getTextArtPreviews();
+ }
+ if (_.isEmpty(shapes)) return;
+
_.each(shapes, function(shape, index){
arr.push({
imageUrl : shape,
@@ -1859,15 +1858,6 @@ define([
});
});
artStore.reset(arr);
-
- setTimeout(function(){
- me.getApplication().getController('Toolbar').fillTextArt();
- }, 50);
-
- setTimeout(function(){
- me.getApplication().getController('RightMenu').fillTextArt();
- }, 50);
-
},
updateThemeColors: function() {
@@ -1875,10 +1865,6 @@ define([
setTimeout(function(){
me.getApplication().getController('RightMenu').UpdateThemeColors();
}, 50);
- setTimeout(function(){
- me.getApplication().getController('DocumentHolder').getView().updateThemeColors();
- }, 50);
-
setTimeout(function(){
me.getApplication().getController('Toolbar').updateThemeColors();
}, 50);
@@ -1890,7 +1876,7 @@ define([
this.updateThemeColors();
var me = this;
setTimeout(function(){
- me.fillTextArt(me.api.asc_getTextArtPreviews());
+ me.fillTextArt();
}, 1);
}
},
diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js
index d79e0ba8c..fd8b9fabc 100644
--- a/apps/documenteditor/main/app/controller/RightMenu.js
+++ b/apps/documenteditor/main/app/controller/RightMenu.js
@@ -251,10 +251,6 @@ define([
this.rightmenu.textartSettings.UpdateThemeColors();
},
- fillTextArt: function() {
- this.rightmenu.textartSettings.fillTextArt();
- },
-
updateMetricUnit: function() {
this.rightmenu.headerSettings.updateMetricUnit();
this.rightmenu.paragraphSettings.updateMetricUnit();
@@ -276,7 +272,7 @@ define([
}
if (this.editMode && this.api) {
- this.rightmenu.shapeSettings.createDelayedElements();
+ // this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 00a89dd3e..cc10f585e 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -103,12 +103,15 @@ define([
this.diagramEditor = null;
this._isAddingShape = false;
this.editMode = true;
+ this.binding = {};
this.addListeners({
'Toolbar': {
'insert:break' : this.onClickPageBreak,
'change:compact' : this.onClickChangeCompact,
- 'home:open' : this.onHomeOpen
+ 'home:open' : this.onHomeOpen,
+ 'add:chart' : this.onSelectChart,
+ 'insert:textart' : this.onInsertTextart
},
'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'),
@@ -312,7 +315,6 @@ define([
toolbar.mnuColorSchema.on('item:click', _.bind(this.onColorSchemaClick, this));
toolbar.mnuColorSchema.on('show:after', _.bind(this.onColorSchemaShow, this));
toolbar.btnMailRecepients.on('click', _.bind(this.onSelectRecepientsClick, this));
- toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this));
toolbar.mnuPageNumberPosPicker.on('item:click', _.bind(this.onInsertPageNumberClick, this));
toolbar.btnEditHeader.menu.on('item:click', _.bind(this.onEditHeaderFooterClick, this));
toolbar.mnuPageNumCurrentPos.on('click', _.bind(this.onPageNumCurrentPosClick, this));
@@ -370,7 +372,7 @@ define([
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this));
- this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this));
+ this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this));
this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this));
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
@@ -1838,11 +1840,8 @@ define([
}
},
- onSelectChart: function(picker, item, record) {
- if (!record) return;
-
+ onSelectChart: function(type) {
var me = this,
- type = record.get('type'),
chart = false;
var selectedElements = me.api.getSelectedElements();
@@ -1882,6 +1881,19 @@ define([
}
},
+ onInsertTextart: function (data) {
+ if (this.api) {
+ this.toolbar.fireEvent('inserttextart', this.toolbar);
+ this.api.AddTextArt(data);
+
+ if (this.toolbar.btnInsertShape.pressed)
+ this.toolbar.btnInsertShape.toggle(false, true);
+
+ Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertTextArt);
+ Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art');
+ }
+ },
+
onInsertPageNumberClick: function(picker, item, record) {
if (this.api)
this.api.put_PageNum(record.get('data').type, record.get('data').subtype);
@@ -2323,10 +2335,49 @@ define([
this._state.clrtext_asccolor = color;
},
+ onApiAutoShapes: function() {
+ var me = this;
+ var onShowBefore = function(menu) {
+ me.fillAutoShapes();
+ menu.off('show:before', onShowBefore);
+ };
+ me.toolbar.btnInsertShape.menu.on('show:before', onShowBefore);
+ },
+
fillAutoShapes: function() {
var me = this,
shapesStore = this.getApplication().getCollection('ShapeGroups');
+ var onShowAfter = function(menu) {
+ for (var i = 0; i < shapesStore.length; i++) {
+ var shapePicker = new Common.UI.DataViewSimple({
+ el: $('#id-toolbar-menu-shapegroup' + i, menu.items[i].$el),
+ store: shapesStore.at(i).get('groupStore'),
+ parentMenu: menu.items[i].menu,
+ itemTemplate: _.template('')
+ });
+ shapePicker.on('item:click', function(picker, item, record, e) {
+ if (me.api) {
+ if (record) {
+ me._addAutoshape(true, record.get('data').shapeType);
+ me._isAddingShape = true;
+ }
+
+ if (me.toolbar.btnInsertText.pressed) {
+ me.toolbar.btnInsertText.toggle(false, true);
+ }
+
+ if (e.type !== 'click')
+ me.toolbar.btnInsertShape.menu.hide();
+ Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape);
+ Common.component.Analytics.trackEvent('ToolBar', 'Add Shape');
+ }
+ });
+ }
+ menu.off('show:after', onShowAfter);
+ };
+ me.toolbar.btnInsertShape.menu.on('show:after', onShowAfter);
+
for (var i = 0; i < shapesStore.length; i++) {
var shapeGroup = shapesStore.at(i);
@@ -2339,34 +2390,7 @@ define([
]
})
});
-
me.toolbar.btnInsertShape.menu.addItem(menuItem);
-
- var shapePicker = new Common.UI.DataView({
- el: $('#id-toolbar-menu-shapegroup' + i),
- store: shapeGroup.get('groupStore'),
- parentMenu: menuItem.menu,
- showLast: false,
- itemTemplate: _.template('')
- });
-
- shapePicker.on('item:click', function(picker, item, record, e) {
- if (me.api) {
- if (record) {
- me._addAutoshape(true, record.get('data').shapeType);
- me._isAddingShape = true;
- }
-
- if (me.toolbar.btnInsertText.pressed) {
- me.toolbar.btnInsertText.toggle(false, true);
- }
-
- if (e.type !== 'click')
- me.toolbar.btnInsertShape.menu.hide();
- Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape);
- Common.component.Analytics.trackEvent('ToolBar', 'Add Shape');
- }
- });
}
},
@@ -2375,12 +2399,44 @@ define([
var me = this, equationsStore = this.getApplication().getCollection('EquationGroups');
- me.equationPickers = [];
me.toolbar.btnInsertEquation.menu.removeAll();
-
+ var onShowAfter = function(menu) {
+ for (var i = 0; i < equationsStore.length; ++i) {
+ var equationPicker = new Common.UI.DataViewSimple({
+ el: $('#id-toolbar-menu-equationgroup' + i, menu.items[i].$el),
+ parentMenu: menu.items[i].menu,
+ store: equationsStore.at(i).get('groupStore'),
+ scrollAlwaysVisible: true,
+ itemTemplate: _.template('' +
+ '' +
+ '
')
+ });
+ equationPicker.on('item:click', function(picker, item, record, e) {
+ if (me.api) {
+ if (record)
+ me.api.asc_AddMath(record.get('data').equationType);
+
+ if (me.toolbar.btnInsertText.pressed) {
+ me.toolbar.btnInsertText.toggle(false, true);
+ }
+ if (me.toolbar.btnInsertShape.pressed) {
+ me.toolbar.btnInsertShape.toggle(false, true);
+ }
+
+ if (e.type !== 'click')
+ me.toolbar.btnInsertEquation.menu.hide();
+ Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertEquation);
+ Common.component.Analytics.trackEvent('ToolBar', 'Add Equation');
+ }
+ });
+ }
+ menu.off('show:after', onShowAfter);
+ };
+ me.toolbar.btnInsertEquation.menu.on('show:after', onShowAfter);
+
for (var i = 0; i < equationsStore.length; ++i) {
var equationGroup = equationsStore.at(i);
-
var menuItem = new Common.UI.MenuItem({
caption: equationGroup.get('groupName'),
menu: new Common.UI.Menu({
@@ -2392,56 +2448,7 @@ define([
]
})
});
-
me.toolbar.btnInsertEquation.menu.addItem(menuItem);
-
- var equationPicker = new Common.UI.DataView({
- el: $('#id-toolbar-menu-equationgroup' + i),
- store: equationGroup.get('groupStore'),
- parentMenu: menuItem.menu,
- showLast: false,
- itemTemplate: _.template('' +
- '
')
- });
- if (equationGroup.get('groupHeight').length) {
-
- me.equationPickers.push(equationPicker);
- me.toolbar.btnInsertEquation.menu.on('show:after', function () {
-
- if (me.equationPickers.length) {
- var element = $(this.el).find('.over').find('.menu-shape');
- if (element.length) {
- for (var i = 0; i < me.equationPickers.length; ++i) {
- if (element[0].id == me.equationPickers[i].el.id) {
- me.equationPickers[i].scroller.update({alwaysVisibleY: true});
- me.equationPickers.splice(i, 1);
- return;
- }
- }
- }
- }
- });
- }
-
- equationPicker.on('item:click', function(picker, item, record, e) {
- if (me.api) {
- if (record)
- me.api.asc_AddMath(record.get('data').equationType);
-
- if (me.toolbar.btnInsertText.pressed) {
- me.toolbar.btnInsertText.toggle(false, true);
- }
- if (me.toolbar.btnInsertShape.pressed) {
- me.toolbar.btnInsertShape.toggle(false, true);
- }
-
- if (e.type !== 'click')
- me.toolbar.btnInsertEquation.menu.hide();
- Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertEquation);
- Common.component.Analytics.trackEvent('ToolBar', 'Add Equation');
- }
- });
}
},
@@ -2453,6 +2460,16 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
},
+ onApiMathTypes: function(equation) {
+ this._equationTemp = equation;
+ var me = this;
+ var onShowBefore = function(menu) {
+ me.onMathTypes(me._equationTemp);
+ me.toolbar.btnInsertEquation.menu.off('show:before', onShowBefore);
+ };
+ me.toolbar.btnInsertEquation.menu.on('show:before', onShowBefore);
+ },
+
onMathTypes: function(equation) {
var equationgrouparray = [],
equationsStore = this.getCollection('EquationGroups');
@@ -2493,35 +2510,29 @@ define([
translationTable[Common.define.c_oAscMathType[name]] = this[translate];
}
}
-
- var i,id = 0, count = 0, length = 0, width = 0, height = 0, store = null, list = null, eqStore = null, eq = null;
+ var i,id = 0, count = 0, length = 0, width = 0, height = 0, store = null, list = null, eqStore = null, eq = null, data;
if (equation) {
-
- count = equation.get_Data().length;
-
+ data = equation.get_Data();
+ count = data.length;
if (count) {
for (var j = 0; j < count; ++j) {
- id = equation.get_Data()[j].get_Id();
- width = equation.get_Data()[j].get_W();
- height = equation.get_Data()[j].get_H();
+ var group = data[j];
+ id = group.get_Id();
+ width = group.get_W();
+ height = group.get_H();
store = new Backbone.Collection([], {
model: DE.Models.EquationModel
});
if (store) {
-
- var allItemsCount = 0, itemsCount = 0, ids = 0;
-
- length = equation.get_Data()[j].get_Data().length;
-
+ var allItemsCount = 0, itemsCount = 0, ids = 0, arr = [];
+ length = group.get_Data().length;
for (i = 0; i < length; ++i) {
- eqStore = equation.get_Data()[j].get_Data()[i];
-
+ eqStore = group.get_Data()[i];
itemsCount = eqStore.get_Data().length;
for (var p = 0; p < itemsCount; ++p) {
-
eq = eqStore.get_Data()[p];
ids = eq.get_Id();
@@ -2530,8 +2541,7 @@ define([
if (translationTable.hasOwnProperty(ids)) {
translate = translationTable[ids];
}
-
- store.add({
+ arr.push({
data : {equationType: ids},
tip : translate,
allowSelected : true,
@@ -2545,7 +2555,7 @@ define([
allItemsCount += itemsCount;
}
-
+ store.add(arr);
width = c_oAscMathMainTypeStrings[id][1] * (width + 10); // 4px margin + 4px margin + 1px border + 1px border
var normHeight = parseInt(370 / (height + 10)) * (height + 10);
@@ -2557,57 +2567,12 @@ define([
});
}
}
-
equationsStore.add(equationgrouparray);
-
this.fillEquations();
}
}
},
- fillTextArt: function() {
- if (!this.toolbar.btnInsertTextArt.rendered) return;
-
- var me = this;
- if (this.toolbar.mnuTextArtPicker) {
- var models = this.getApplication().getCollection('Common.Collections.TextArt').models,
- count = this.toolbar.mnuTextArtPicker.store.length;
- if (count>0 && count==models.length) {
- var data = this.toolbar.mnuTextArtPicker.store.models;
- _.each(models, function(template, index){
- data[index].set('imageUrl', template.get('imageUrl'));
- });
- } else {
- this.toolbar.mnuTextArtPicker.store.reset(models);
- }
- } else {
- this.toolbar.mnuTextArtPicker = new Common.UI.DataView({
- el: $('#id-toolbar-menu-insart'),
- store: this.getApplication().getCollection('Common.Collections.TextArt'),
- parentMenu: this.toolbar.btnInsertTextArt.menu,
- showLast: false,
- itemTemplate: _.template('
')
- });
-
- this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
- if (me.api) {
- if (record) {
- me.toolbar.fireEvent('inserttextart', me.toolbar);
- me.api.AddTextArt(record.get('data'));
- }
-
- if (me.toolbar.btnInsertShape.pressed)
- me.toolbar.btnInsertShape.toggle(false, true);
-
- if (e.type !== 'click')
- me.toolbar.btnInsertTextArt.menu.hide();
- Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertTextArt);
- Common.component.Analytics.trackEvent('ToolBar', 'Add Text Art');
- }
- });
- }
- },
-
activateControls: function() {
_.each(this.toolbar.toolbarControls, function(item){
item.setDisabled(false);
diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
index eef6af3e7..54ad031fd 100644
--- a/apps/documenteditor/main/app/controller/Viewport.js
+++ b/apps/documenteditor/main/app/controller/Viewport.js
@@ -116,11 +116,20 @@ define([
Common.NotificationCenter.on('api:disconnect', this.onApiCoAuthoringDisconnect.bind(this));
},
+ getApi: function() {
+ return this.api;
+ },
// When our application is ready, lets get started
onLaunch: function() {
// Create and render main view
this.viewport = this.createView('Viewport').render();
+
+ this.api = new Asc.asc_docs_api({
+ 'id-view' : 'editor_sdk',
+ 'translate': this.getApplication().getController('Main').translationTable
+ });
+
this.header = this.createView('Common.Views.Header', {
headerCaption: 'Document Editor',
storeUsers: DE.getCollection('Common.Collections.Users')
diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js
index c0eedc91d..64eb011be 100644
--- a/apps/documenteditor/main/app/view/ChartSettings.js
+++ b/apps/documenteditor/main/app/view/ChartSettings.js
@@ -84,16 +84,16 @@ define([
this._originalProps = null;
this.render();
-
- this.labelWidth = $(this.el).find('#chart-label-width');
- this.labelHeight = $(this.el).find('#chart-label-height');
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
scope: this
}));
+
+ this.labelWidth = el.find('#chart-label-width');
+ this.labelHeight = el.find('#chart-label-height');
},
setApi: function(api) {
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index a9344feff..6d3301d82 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -743,21 +743,11 @@ define([
};
this.changeLanguageMenu = function(menu) {
- var i;
if (me._currLang.id===null || me._currLang.id===undefined) {
- for (i=0; i-1) && !menu.items[index].checked && menu.setChecked(index, true);
}
};
@@ -1850,11 +1840,6 @@ define([
}
},
- updateThemeColors: function() {
- this.effectcolors = Common.Utils.ThemeColor.getEffectColors();
- this.standartcolors = Common.Utils.ThemeColor.getStandartColors();
- },
-
onCutCopyPaste: function(item, e) {
var me = this;
if (me.api) {
@@ -2773,13 +2758,21 @@ define([
})
});
+ var langTemplate = _.template([
+ '',
+ '',
+ '<%= caption %>',
+ ''
+ ].join(''));
+
me.langTableMenu = new Common.UI.MenuItem({
caption : me.langText,
- menu : new Common.UI.Menu({
+ menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
menuAlign: 'tl-tr',
restoreHeight: 285,
items : [],
+ itemTemplate: langTemplate,
search: true
})
});
@@ -3426,11 +3419,12 @@ define([
me.langParaMenu = new Common.UI.MenuItem({
caption : me.langText,
- menu : new Common.UI.Menu({
+ menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
menuAlign: 'tl-tr',
restoreHeight: 285,
items : [],
+ itemTemplate: langTemplate,
search: true
})
});
@@ -3828,58 +3822,39 @@ define([
var me = this;
if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
- me.langParaMenu.menu.removeAll();
- me.langTableMenu.menu.removeAll();
- _.each(langs, function(lang, index){
- me.langParaMenu.menu.addItem(new Common.UI.MenuItem({
+ var arrPara = [], arrTable = [];
+ _.each(langs, function(lang) {
+ var item = {
caption : lang.displayValue,
value : lang.value,
checkable : true,
- toggleGroup : 'popupparalang',
langid : lang.code,
- spellcheck : lang.spellcheck,
- template: _.template([
- '',
- '',
- '<%= caption %>',
- ''
- ].join(''))
- }).on('click', function(item, e){
- if (me.api){
- if (!_.isUndefined(item.options.langid))
- me.api.put_TextPrLang(item.options.langid);
+ spellcheck : lang.spellcheck
+ };
+ arrPara.push(item);
+ arrTable.push(_.clone(item));
+ });
+ me.langParaMenu.menu.resetItems(arrPara);
+ me.langTableMenu.menu.resetItems(arrTable);
- me._currLang.paraid = item.options.langid;
- me.langParaMenu.menu.currentCheckedItem = item;
+ me.langParaMenu.menu.on('item:click', function(menu, item){
+ if (me.api){
+ if (!_.isUndefined(item.langid))
+ me.api.put_TextPrLang(item.langid);
- me.fireEvent('editcomplete', me);
- }
- }));
+ me._currLang.paraid = item.langid;
+ me.fireEvent('editcomplete', me);
+ }
+ });
- me.langTableMenu.menu.addItem(new Common.UI.MenuItem({
- caption : lang.displayValue,
- value : lang.value,
- checkable : true,
- toggleGroup : 'popuptablelang',
- langid : lang.code,
- spellcheck : lang.spellcheck,
- template: _.template([
- '',
- '',
- '<%= caption %>',
- ''
- ].join(''))
- }).on('click', function(item, e){
- if (me.api){
- if (!_.isUndefined(item.options.langid))
- me.api.put_TextPrLang(item.options.langid);
+ me.langTableMenu.menu.on('item:click', function(menu, item, e){
+ if (me.api){
+ if (!_.isUndefined(item.langid))
+ me.api.put_TextPrLang(item.langid);
- me._currLang.tableid = item.options.langid;
- me.langTableMenu.menu.currentCheckedItem = item;
-
- me.fireEvent('editcomplete', me);
- }
- }));
+ me._currLang.tableid = item.langid;
+ me.fireEvent('editcomplete', me);
+ }
});
}
},
diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js
index bbf120cf3..5fcf1c1d4 100644
--- a/apps/documenteditor/main/app/view/FileMenu.js
+++ b/apps/documenteditor/main/app/view/FileMenu.js
@@ -49,6 +49,7 @@ define([
DE.Views.FileMenu = Common.UI.BaseView.extend(_.extend({
el: '#file-menu-panel',
+ rendered: false,
options: {alias:'FileMenu'},
template: _.template(tpl),
@@ -81,95 +82,109 @@ define([
},
render: function () {
- this.$el = $(this.el);
- this.$el.html(this.template());
+ var $markup = $(this.template());
this.miSave = new Common.UI.MenuItem({
- el : $('#fm-btn-save',this.el),
+ el : $markup.elementById('#fm-btn-save'),
action : 'save',
caption : this.btnSaveCaption,
canFocused: false
});
+ if ( !!this.options.miSave ) {
+ this.miSave.setDisabled(this.options.miSave.isDisabled());
+ delete this.options.miSave;
+ }
+
this.miEdit = new Common.UI.MenuItem({
- el : $('#fm-btn-edit',this.el),
+ el : $markup.elementById('#fm-btn-edit'),
action : 'edit',
caption : this.btnToEditCaption,
canFocused: false
});
this.miDownload = new Common.UI.MenuItem({
- el : $('#fm-btn-download',this.el),
+ el : $markup.elementById('#fm-btn-download'),
action : 'saveas',
caption : this.btnDownloadCaption,
canFocused: false
});
this.miSaveCopyAs = new Common.UI.MenuItem({
- el : $('#fm-btn-save-copy',this.el),
+ el : $markup.elementById('#fm-btn-save-copy'),
action : 'save-copy',
caption : this.btnSaveCopyAsCaption,
canFocused: false
});
this.miSaveAs = new Common.UI.MenuItem({
- el : $('#fm-btn-save-desktop',this.el),
+ el : $markup.elementById('#fm-btn-save-desktop'),
action : 'save-desktop',
caption : this.btnSaveAsCaption,
canFocused: false
});
this.miPrint = new Common.UI.MenuItem({
- el : $('#fm-btn-print',this.el),
+ el : $markup.elementById('#fm-btn-print'),
action : 'print',
caption : this.btnPrintCaption,
canFocused: false
});
this.miRename = new Common.UI.MenuItem({
- el : $('#fm-btn-rename',this.el),
+ el : $markup.elementById('#fm-btn-rename'),
action : 'rename',
caption : this.btnRenameCaption,
canFocused: false
});
+ if ( !!this.options.miRename ) {
+ this.miRename.setDisabled(this.options.miRename.isDisabled());
+ delete this.options.miRename;
+ }
+
this.miProtect = new Common.UI.MenuItem({
- el : $('#fm-btn-protect',this.el),
+ el : $markup.elementById('#fm-btn-protect'),
action : 'protect',
caption : this.btnProtectCaption,
canFocused: false
});
+ if ( !!this.options.miProtect ) {
+ this.miProtect.setDisabled(this.options.miProtect.isDisabled());
+ delete this.options.miProtect;
+ }
+
this.miRecent = new Common.UI.MenuItem({
- el : $('#fm-btn-recent',this.el),
+ el : $markup.elementById('#fm-btn-recent'),
action : 'recent',
caption : this.btnRecentFilesCaption,
canFocused: false
});
this.miNew = new Common.UI.MenuItem({
- el : $('#fm-btn-create',this.el),
+ el : $markup.elementById('#fm-btn-create'),
action : 'new',
caption : this.btnCreateNewCaption,
canFocused: false
});
this.miAccess = new Common.UI.MenuItem({
- el : $('#fm-btn-rights',this.el),
+ el : $markup.elementById('#fm-btn-rights'),
action : 'rights',
caption : this.btnRightsCaption,
canFocused: false
});
this.miHistory = new Common.UI.MenuItem({
- el : $('#fm-btn-history',this.el),
+ el : $markup.elementById('#fm-btn-history'),
action : 'history',
caption : this.btnHistoryCaption,
canFocused: false
});
this.miHelp = new Common.UI.MenuItem({
- el : $('#fm-btn-help',this.el),
+ el : $markup.elementById('#fm-btn-help'),
action : 'help',
caption : this.btnHelpCaption,
canFocused: false
@@ -178,7 +193,7 @@ define([
this.items = [];
this.items.push(
new Common.UI.MenuItem({
- el : $('#fm-btn-return',this.el),
+ el : $markup.elementById('#fm-btn-return'),
action : 'back',
caption : this.btnCloseMenuCaption,
canFocused: false
@@ -194,7 +209,7 @@ define([
this.miRecent,
this.miNew,
new Common.UI.MenuItem({
- el : $('#fm-btn-info',this.el),
+ el : $markup.elementById('#fm-btn-info'),
action : 'info',
caption : this.btnInfoCaption,
canFocused: false
@@ -202,29 +217,31 @@ define([
this.miAccess,
this.miHistory,
new Common.UI.MenuItem({
- el : $('#fm-btn-settings',this.el),
+ el : $markup.elementById('#fm-btn-settings'),
action : 'opts',
caption : this.btnSettingsCaption,
canFocused: false
}),
this.miHelp,
new Common.UI.MenuItem({
- el : $('#fm-btn-back',this.el),
+ el : $markup.elementById('#fm-btn-back'),
+ // el : _get_el('fm-btn-back'),
action : 'exit',
caption : this.btnBackCaption,
canFocused: false
})
);
- var me = this;
- me.panels = {
-// 'saveas' : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
- 'opts' : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
- 'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
- 'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render()
- };
+ this.rendered = true;
+ this.$el.html($markup);
+ this.$el.find('.content-box').hide();
+ this.applyMode();
- me.$el.find('.content-box').hide();
+ if ( !!this.api ) {
+ this.panels['info'].setApi(this.api);
+ if ( this.panels['protect'] )
+ this.panels['protect'].setApi(this.api);
+ }
return this;
},
@@ -232,6 +249,9 @@ define([
show: function(panel, opts) {
if (this.isVisible() && panel===undefined || !this.mode) return;
+ if ( !this.rendered )
+ this.render();
+
var defPanel = (this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) ? 'saveas' : 'info';
if (!panel)
panel = this.active || defPanel;
@@ -250,6 +270,16 @@ define([
},
applyMode: function() {
+ if (!this.panels) {
+ this.panels = {
+ 'opts' : (new DE.Views.FileMenuPanels.Settings({menu:this})).render(this.$el.find('#panel-settings')),
+ 'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:this})).render(this.$el.find('#panel-info')),
+ 'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:this})).render(this.$el.find('#panel-rights'))
+ };
+ }
+
+ if (!this.mode) return;
+
this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
@@ -284,32 +314,29 @@ define([
if ( this.mode.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) {
$('a',this.miNew.$el).text(this.btnCreateNewCaption + '...');
- this.panels['new'] = ((new DE.Views.FileMenuPanels.CreateNew({menu: this, docs: this.mode.templates})).render());
+ !this.panels['new'] && (this.panels['new'] = ((new DE.Views.FileMenuPanels.CreateNew({menu: this, docs: this.mode.templates})).render()));
}
}
- if ( this.mode.canOpenRecent ) {
- if (this.mode.recent){
- this.panels['recent'] = (new DE.Views.FileMenuPanels.RecentFiles({menu:this, recent: this.mode.recent})).render();
- }
+ if ( this.mode.canOpenRecent && this.mode.recent ) {
+ !this.panels['recent'] && (this.panels['recent'] = (new DE.Views.FileMenuPanels.RecentFiles({menu:this, recent: this.mode.recent})).render());
}
if (this.mode.canProtect) {
-// this.$el.find('#fm-btn-back').hide();
- this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render();
+ !this.panels['protect'] && (this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render());
this.panels['protect'].setMode(this.mode);
}
if (this.mode.canDownload) {
- this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render());
+ !this.panels['saveas'] && (this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render()));
} else if (this.mode.canDownloadOrigin)
$('a',this.miDownload.$el).text(this.textDownload);
if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) {
- this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render());
+ !this.panels['save-copy'] && (this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()));
}
- if (this.mode.canHelp) {
+ if (this.mode.canHelp && !this.panels['help']) {
this.panels['help'] = ((new DE.Views.FileMenuPanels.Help({menu: this})).render());
this.panels['help'].setLangConfig(this.mode.lang);
}
@@ -329,13 +356,22 @@ define([
this.mode = mode;
}
- if (!delay) this.applyMode();
+ if (!delay) {
+ if ( this.rendered )
+ this.applyMode();
+ }
+ return this;
},
setApi: function(api) {
this.api = api;
- this.panels['info'].setApi(api);
- if (this.panels['protect']) this.panels['protect'].setApi(api);
+
+ if ( this.rendered ) {
+ this.panels['info'].setApi(api);
+ if (this.panels['protect']) this.panels['protect'].setApi(api);
+ }
+
+ return this;
},
loadDocument: function(data) {
@@ -369,8 +405,11 @@ define([
},
SetDisabled: function(disable) {
- this.miSave[(disable || !this.mode.isEdit)?'hide':'show']();
- this.miRename[(disable || !this.mode.canRename || this.mode.isDesktopApp) ?'hide':'show']();
+ var _btn_save = this.getButton('save'),
+ _btn_rename = this.getButton('rename');
+
+ _btn_save[(disable || !this.mode.isEdit)?'hide':'show']();
+ _btn_rename[(disable || !this.mode.canRename || this.mode.isDesktopApp) ?'hide':'show']();
},
isVisible: function () {
@@ -378,8 +417,27 @@ define([
},
getButton: function(type) {
- if (type == 'save')
- return this.miSave;
+ if ( !this.rendered ) {
+ if (type == 'save') {
+ return this.options.miSave ? this.options.miSave : (this.options.miSave = new Common.UI.MenuItem({}));
+ } else
+ if (type == 'rename') {
+ return this.options.miRename ? this.options.miRename : (this.options.miRename = new Common.UI.MenuItem({}));
+ } else
+ if (type == 'protect') {
+ return this.options.miProtect ? this.options.miProtect : (this.options.miProtect = new Common.UI.MenuItem({}));
+ }
+ } else {
+ if (type == 'save') {
+ return this.miSave;
+ } else
+ if (type == 'rename') {
+ return this.miRename;
+ }else
+ if (type == 'protect') {
+ return this.miProtect;
+ }
+ }
},
btnSaveCaption : 'Save',
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index c36eb3b0c..8496d4599 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -87,12 +87,12 @@ define([
},
render: function() {
- $(this.el).html(this.template({rows:this.formats}));
+ this.$el.html(this.template({rows:this.formats}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -148,12 +148,12 @@ define([
},
render: function() {
- $(this.el).html(this.template({rows:this.formats}));
+ this.$el.html(this.template({rows:this.formats}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -247,30 +247,31 @@ define([
this.menu = options.menu;
},
- render: function() {
- $(this.el).html(this.template({scope: this}));
+ render: function(node) {
+ var me = this;
+ var $markup = $(this.template({scope: this}));
this.chInputMode = new Common.UI.CheckBox({
- el: $('#fms-chb-input-mode'),
+ el: $markup.findById('#fms-chb-input-mode'),
labelText: this.strInputMode
});
/** coauthoring begin **/
this.chLiveComment = new Common.UI.CheckBox({
- el: $('#fms-chb-live-comment'),
+ el: $markup.findById('#fms-chb-live-comment'),
labelText: this.strLiveComment
- }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
- this.chResolvedComment.setDisabled(field.getValue()!=='checked');
- }, this));
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ me.chResolvedComment.setDisabled(field.getValue()!=='checked');
+ });
this.chResolvedComment = new Common.UI.CheckBox({
- el: $('#fms-chb-resolved-comment'),
+ el: $markup.findById('#fms-chb-resolved-comment'),
labelText: this.strResolvedComment
});
/** coauthoring end **/
this.chSpell = new Common.UI.CheckBox({
- el: $('#fms-chb-spell-check'),
+ el: $markup.findById('#fms-chb-spell-check'),
labelText: this.strSpellCheckMode
});
@@ -280,28 +281,28 @@ define([
});
this.chAutosave = new Common.UI.CheckBox({
- el: $('#fms-chb-autosave'),
+ el: $markup.findById('#fms-chb-autosave'),
labelText: this.strAutosave
- }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
- if (field.getValue()!=='checked' && this.cmbCoAuthMode.getValue()) {
- this.cmbCoAuthMode.setValue(0);
- this.onSelectCoAuthMode(this.cmbCoAuthMode.getSelectedRecord());
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ if (field.getValue()!=='checked' && me.cmbCoAuthMode.getValue()) {
+ me.cmbCoAuthMode.setValue(0);
+ me.onSelectCoAuthMode(me.cmbCoAuthMode.getSelectedRecord());
}
- }, this));
- this.lblAutosave = $('#fms-lbl-autosave');
+ });
+ this.lblAutosave = $markup.findById('#fms-lbl-autosave');
this.chForcesave = new Common.UI.CheckBox({
- el: $('#fms-chb-forcesave'),
+ el: $markup.findById('#fms-chb-forcesave'),
labelText: this.strForcesave
});
this.chAlignGuides = new Common.UI.CheckBox({
- el: $('#fms-chb-align-guides'),
+ el: $markup.findById('#fms-chb-align-guides'),
labelText: this.strAlignGuides
});
this.cmbZoom = new Common.UI.ComboBox({
- el : $('#fms-cmb-zoom'),
+ el : $markup.findById('#fms-cmb-zoom'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -325,7 +326,7 @@ define([
/** coauthoring begin **/
this.cmbShowChanges = new Common.UI.ComboBox({
- el : $('#fms-cmb-show-changes'),
+ el : $markup.findById('#fms-cmb-show-changes'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -337,7 +338,7 @@ define([
});
this.cmbCoAuthMode = new Common.UI.ComboBox({
- el : $('#fms-cmb-coauth-mode'),
+ el : $markup.findById('#fms-cmb-coauth-mode'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -345,17 +346,17 @@ define([
{ value: 1, displayValue: this.strFast, descValue: this.strCoAuthModeDescFast},
{ value: 0, displayValue: this.strStrict, descValue: this.strCoAuthModeDescStrict }
]
- }).on('selected', _.bind( function(combo, record) {
- if (record.value == 1 && (this.chAutosave.getValue()!=='checked'))
- this.chAutosave.setValue(1);
- this.onSelectCoAuthMode(record);
- }, this));
+ }).on('selected', function(combo, record) {
+ if (record.value == 1 && (me.chAutosave.getValue()!=='checked'))
+ me.chAutosave.setValue(1);
+ me.onSelectCoAuthMode(record);
+ });
- this.lblCoAuthMode = $('#fms-lbl-coauth-mode');
+ this.lblCoAuthMode = $markup.findById('#fms-lbl-coauth-mode');
/** coauthoring end **/
this.cmbFontRender = new Common.UI.ComboBox({
- el : $('#fms-cmb-font-render'),
+ el : $markup.find('#fms-cmb-font-render'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -367,7 +368,7 @@ define([
});
this.cmbUnit = new Common.UI.ComboBox({
- el : $('#fms-cmb-unit'),
+ el : $markup.findById('#fms-cmb-unit'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -379,18 +380,19 @@ define([
});
this.btnApply = new Common.UI.Button({
- el: '#fms-btn-apply'
+ el: $markup.findById('#fms-btn-apply')
});
- this.btnApply.on('click', _.bind(this.applySettings, this));
+ this.btnApply.on('click', this.applySettings.bind(this));
+
+ this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
-
return this;
},
@@ -564,7 +566,7 @@ define([
},
render: function() {
- $(this.el).html(this.template());
+ this.$el.html(this.template());
this.viewRecentPicker = new Common.UI.DataView({
el: $('#id-recent-view'),
@@ -582,7 +584,7 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -644,14 +646,14 @@ define([
},
render: function() {
- $(this.el).html(this.template({
+ this.$el.html(this.template({
scope: this,
docs: this.options[0].docs
}));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -784,23 +786,22 @@ define([
this._locked = false;
},
- render: function() {
- $(this.el).html(this.template({scope: this}));
-
+ render: function(node) {
var me = this;
+ var $markup = $(me.template());
// server info
- this.lblPlacement = $('#id-info-placement');
- this.lblOwner = $('#id-info-owner');
- this.lblUploaded = $('#id-info-uploaded');
+ this.lblPlacement = $markup.findById('#id-info-placement');
+ this.lblOwner = $markup.findById('#id-info-owner');
+ this.lblUploaded = $markup.findById('#id-info-uploaded');
// statistic info
- this.lblStatPages = $('#id-info-pages');
- this.lblStatWords = $('#id-info-words');
- this.lblStatParagraphs = $('#id-info-paragraphs');
- this.lblStatSymbols = $('#id-info-symbols');
- this.lblStatSpaces = $('#id-info-spaces');
- // this.lblEditTime = $('#id-info-edittime');
+ this.lblStatPages = $markup.findById('#id-info-pages');
+ this.lblStatWords = $markup.findById('#id-info-words');
+ this.lblStatParagraphs = $markup.findById('#id-info-paragraphs');
+ this.lblStatSymbols = $markup.findById('#id-info-symbols');
+ this.lblStatSpaces = $markup.findById('#id-info-spaces');
+ // this.lblEditTime = $markup.find('#id-info-edittime');
// edited info
var keyDownBefore = function(input, e){
@@ -815,37 +816,37 @@ define([
};
this.inputTitle = new Common.UI.InputField({
- el : $('#id-info-title'),
+ el : $markup.findById('#id-info-title'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
}).on('keydown:before', keyDownBefore);
this.inputSubject = new Common.UI.InputField({
- el : $('#id-info-subject'),
+ el : $markup.findById('#id-info-subject'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
}).on('keydown:before', keyDownBefore);
this.inputComment = new Common.UI.InputField({
- el : $('#id-info-comment'),
+ el : $markup.findById('#id-info-comment'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
}).on('keydown:before', keyDownBefore);
// modify info
- this.lblModifyDate = $('#id-info-modify-date');
- this.lblModifyBy = $('#id-info-modify-by');
+ this.lblModifyDate = $markup.findById('#id-info-modify-date');
+ this.lblModifyBy = $markup.findById('#id-info-modify-by');
// creation info
- this.lblDate = $('#id-info-date');
- this.lblApplication = $('#id-info-appname');
- this.tblAuthor = $('#id-info-author table');
- this.trAuthor = $('#id-info-add-author').closest('tr');
+ this.lblDate = $markup.findById('#id-info-date');
+ this.lblApplication = $markup.findById('#id-info-appname');
+ this.tblAuthor = $markup.findById('#id-info-author table');
+ this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
this.authorTpl = '0; i++) {
+ var store = shapesStore.at(i > -1 ? i : 0).get('groupStore');
+ if (i<0) {
+ store = store.clone();
+ store.shift();
+ }
+ var shapePicker = new Common.UI.DataViewSimple({
+ el: $('#id-shape-menu-shapegroup' + (i+1), menu.items[i+1].$el),
+ store: store,
+ parentMenu: menu.items[i+1].menu,
+ itemTemplate: _.template('')
+ });
+ shapePicker.on('item:click', function(picker, item, record, e) {
+ if (me.api) {
+ me.api.ChangeShapeType(record.get('data').shapeType);
+ me.fireEvent('editcomplete', me);
+ }
+ if (e.type !== 'click')
+ me.btnChangeShape.menu.hide();
+ });
+ }
+ menu.off('show:after', onShowAfter);
+ };
+ me.btnChangeShape.menu.on('show:after', onShowAfter);
- var count = shapesStore.length;
for (var i=-1; i0; i++) {
- var shapeGroup = shapesStore.at(i>-1 ? i : i+1);
+ var shapeGroup = shapesStore.at(i > -1 ? i : i + 1);
var menuItem = new Common.UI.MenuItem({
caption: shapeGroup.get('groupName'),
menu: new Common.UI.Menu({
menuAlign: 'tr-tl',
items: [
- { template: _.template('') }
+ {template: _.template('')}
]
})
});
me.btnChangeShape.menu.addItem(menuItem);
-
- var store = shapeGroup.get('groupStore');
- if (i<0) {
- store = store.clone();
- store.shift();
- }
- var shapePicker = new Common.UI.DataView({
- el: $('#id-shape-menu-shapegroup' + (i+1)),
- store: store,
- parentMenu: menuItem.menu,
- showLast: false,
- itemTemplate: _.template('')
- });
-
- shapePicker.on('item:click', function(picker, item, record, e) {
- if (me.api) {
- me.api.ChangeShapeType(record.get('data').shapeType);
- me.fireEvent('editcomplete', me);
- }
- if (e.type !== 'click')
- me.btnChangeShape.menu.hide();
- });
}
+ me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage);
+ me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage);
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
+
if (!this.btnBackColor) {
// create color buttons
this.btnBackColor = new Common.UI.ColorButton({
@@ -1674,7 +1701,6 @@ define([
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
-
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
@@ -1751,7 +1777,6 @@ define([
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
-
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js
index f8131e80d..c8b9cc613 100644
--- a/apps/documenteditor/main/app/view/Statusbar.js
+++ b/apps/documenteditor/main/app/view/Statusbar.js
@@ -66,7 +66,7 @@ define([
Common.Utils.String.format(this.pageIndexText, model.get('current'), model.get('count')) );
}
- function _clickLanguage(menu, item, state) {
+ function _clickLanguage(menu, item) {
var $parent = menu.$el.parent();
$parent.find('#status-label-lang').text(item.caption);
this.langMenu.prevTip = item.value.value;
@@ -228,13 +228,13 @@ define([
disabled: true
});
- this.langMenu = new Common.UI.Menu({
+ this.langMenu = new Common.UI.MenuSimple({
cls: 'lang-menu',
style: 'margin-top:-5px;',
restoreHeight: 285,
itemTemplate: _.template([
- '',
- '',
+ '',
+ '',
'<%= caption %>',
''
].join('')),
@@ -340,18 +340,18 @@ define([
},
reloadLanguages: function(array) {
- this.langMenu.removeAll();
+ var arr = [],
+ saved = this.langMenu.saved;
_.each(array, function(item) {
- this.langMenu.addItem({
+ arr.push({
caption : item['displayValue'],
value : {value: item['value'], code: item['code']},
checkable : true,
- checked : this.langMenu.saved == item['displayValue'],
- spellcheck : item['spellcheck'],
- toggleGroup : 'language'
+ checked : saved == item['displayValue'],
+ spellcheck : item['spellcheck']
});
- }, this);
-
+ });
+ this.langMenu.resetItems(arr);
if (this.langMenu.items.length>0) {
this.btnLanguage.setDisabled(!!this.mode.isDisconnected);
}
@@ -365,9 +365,9 @@ define([
this.langMenu.prevTip = info.value;
var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; });
- if (lang)
- lang.setChecked(true);
- else {
+ if (lang) {
+ this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true);
+ } else {
this.langMenu.saved = info.displayValue;
this.langMenu.clearAll();
}
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index ad1d1f911..9e7bdda98 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -231,7 +231,7 @@ define([
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
scope: this
}));
@@ -431,10 +431,10 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.updateMetricUnit();
- this._initSettings = false;
},
ChangeSettings: function(props) {
@@ -641,6 +641,7 @@ define([
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
if (!this.btnBackColor) {
// create color buttons
this.btnBorderColor = new Common.UI.ColorButton({
@@ -715,7 +716,6 @@ define([
data[index].set('imageUrl', template.asc_getImage());
});
} else {
- self.cmbTableTemplate.menuPicker.store.reset([]);
var arr = [];
_.each(Templates, function(template){
arr.push({
@@ -725,7 +725,7 @@ define([
tip : template.asc_getDisplayName()
});
});
- self.cmbTableTemplate.menuPicker.store.add(arr);
+ self.cmbTableTemplate.menuPicker.store.reset(arr);
}
},
diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js
index 663bd9537..4613bf022 100644
--- a/apps/documenteditor/main/app/view/TextArtSettings.js
+++ b/apps/documenteditor/main/app/view/TextArtSettings.js
@@ -105,20 +105,24 @@ define([
this.BorderSize = 0;
this.BorderType = Asc.c_oDashType.solid;
+ DE.getCollection('Common.Collections.TextArt').bind({
+ reset: this.fillTextArt.bind(this)
+ });
+
this.render();
+ },
+
+ render: function () {
+ var el = this.$el || $(this.el);
+ el.html(this.template({
+ scope: this
+ }));
this.FillColorContainer = $('#textart-panel-color-fill');
this.FillGradientContainer = $('#textart-panel-gradient-fill');
this.TransparencyContainer = $('#textart-panel-transparent-fill');
},
- render: function () {
- var el = $(this.el);
- el.html(this.template({
- scope: this
- }));
- },
-
setApi: function(api) {
this.api = api;
return this;
@@ -985,15 +989,17 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
- this._initSettings = false;
+ this.fillTextArt();
},
fillTextArt: function() {
+ if (this._initSettings) return;
+
var me = this;
-
if (!this.cmbTextArt) {
this.cmbTextArt = new Common.UI.ComboDataView({
itemWidth: 50,
@@ -1017,6 +1023,10 @@ define([
var models = this.application.getCollection('Common.Collections.TextArt').models,
count = this.cmbTextArt.menuPicker.store.length;
+ if (models.length<1) {
+ DE.getController('Main').fillTextArt(this.api.asc_getTextArtPreviews());
+ return;
+ }
if (count>0 && count==models.length) {
var data = this.cmbTextArt.menuPicker.store.models;
_.each(models, function(template, index){
@@ -1073,6 +1083,7 @@ define([
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@@ -1132,7 +1143,6 @@ define([
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
}
-
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsGrad.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 60c729e5b..ade6b68a7 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -506,12 +506,7 @@ define([
cls: 'btn-toolbar x-huge icon-top',
caption: me.capBtnInsChart,
iconCls: 'btn-insertchart',
- menu: new Common.UI.Menu({
- style: 'width: 435px;',
- items: [
- {template: _.template('')}
- ]
- })
+ menu: true
});
this.paragraphControls.push(this.btnInsertChart);
@@ -1270,7 +1265,7 @@ define([
rendererComponents: function (html) {
var $host = $(html);
var _injectComponent = function (id, cmp) {
- Common.Utils.injectComponent($host.find(id), cmp);
+ Common.Utils.injectComponent($host.findById(id), cmp);
};
_injectComponent('#slot-field-fontname', this.cmbFontName);
@@ -1656,6 +1651,91 @@ define([
this.paragraphControls.push(this.mnuPageNumCurrentPos);
this.paragraphControls.push(this.mnuInsertPageCount);
+ this.btnInsertChart.setMenu( new Common.UI.Menu({
+ style: 'width: 435px;',
+ items: [
+ {template: _.template('')}
+ ]
+ }));
+
+ var onShowBefore = function(menu) {
+ var picker = new Common.UI.DataView({
+ el: $('#id-toolbar-menu-insertchart'),
+ parentMenu: menu,
+ showLast: false,
+ restoreHeight: 421,
+ groups: new Common.UI.DataViewGroupStore([
+ {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
+ {id: 'menu-chart-group-line', caption: me.textLine},
+ {id: 'menu-chart-group-pie', caption: me.textPie},
+ {id: 'menu-chart-group-hbar', caption: me.textBar},
+ {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
+ {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
+ {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
+ // {id: 'menu-chart-group-surface', caption: me.textSurface}
+ ]),
+ store: new Common.UI.DataViewStore([
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
+ { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
+ { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
+
+ ]),
+ itemTemplate: _.template('')
+ });
+ picker.on('item:click', function (picker, item, record, e) {
+ if (record)
+ me.fireEvent('add:chart', [record.get('type')]);
+ });
+ menu.off('show:before', onShowBefore);
+ };
+ this.btnInsertChart.menu.on('show:before', onShowBefore);
+
+ var onShowBeforeTextArt = function (menu) {
+ var collection = DE.getCollection('Common.Collections.TextArt');
+ if (collection.length<1)
+ DE.getController('Main').fillTextArt(me.api.asc_getTextArtPreviews());
+ var picker = new Common.UI.DataView({
+ el: $('#id-toolbar-menu-insart'),
+ store: collection,
+ parentMenu: menu,
+ showLast: false,
+ itemTemplate: _.template('')
+ });
+ picker.on('item:click', function (picker, item, record, e) {
+ if (record)
+ me.fireEvent('insert:textart', [record.get('data')]);
+ if (e.type !== 'click') menu.hide();
+ });
+ menu.off('show:before', onShowBeforeTextArt);
+ };
+ this.btnInsertTextArt.menu.on('show:before', onShowBeforeTextArt);
+
// set dataviews
var _conf = this.mnuMarkersPicker.conf;
@@ -1773,181 +1853,6 @@ define([
});
_conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled);
- this.mnuInsertChartPicker = new Common.UI.DataView({
- el: $('#id-toolbar-menu-insertchart'),
- parentMenu: this.btnInsertChart.menu,
- showLast: false,
- restoreHeight: 421,
- groups: new Common.UI.DataViewGroupStore([
- {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
- {id: 'menu-chart-group-line', caption: me.textLine},
- {id: 'menu-chart-group-pie', caption: me.textPie},
- {id: 'menu-chart-group-hbar', caption: me.textBar},
- {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
- {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
- {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
- // {id: 'menu-chart-group-surface', caption: me.textSurface}
- ]),
- store: new Common.UI.DataViewStore([
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal,
- allowSelected: true,
- iconCls: 'column-normal',
- selected: true
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStacked,
- allowSelected: true,
- iconCls: 'column-stack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStackedPer,
- allowSelected: true,
- iconCls: 'column-pstack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal3d,
- allowSelected: true,
- iconCls: 'column-3d-normal'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStacked3d,
- allowSelected: true,
- iconCls: 'column-3d-stack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStackedPer3d,
- allowSelected: true,
- iconCls: 'column-3d-pstack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,
- allowSelected: true,
- iconCls: 'column-3d-normal-per'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineNormal,
- allowSelected: true,
- iconCls: 'line-normal'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineStacked,
- allowSelected: true,
- iconCls: 'line-stack'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineStackedPer,
- allowSelected: true,
- iconCls: 'line-pstack'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.line3d,
- allowSelected: true,
- iconCls: 'line-3d'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.pie,
- allowSelected: true,
- iconCls: 'pie-normal'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.doughnut,
- allowSelected: true,
- iconCls: 'pie-doughnut'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.pie3d,
- allowSelected: true,
- iconCls: 'pie-3d-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarNormal,
- allowSelected: true,
- iconCls: 'bar-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStacked,
- allowSelected: true,
- iconCls: 'bar-stack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStackedPer,
- allowSelected: true,
- iconCls: 'bar-pstack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarNormal3d,
- allowSelected: true,
- iconCls: 'bar-3d-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStacked3d,
- allowSelected: true,
- iconCls: 'bar-3d-stack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,
- allowSelected: true,
- iconCls: 'bar-3d-pstack'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaNormal,
- allowSelected: true,
- iconCls: 'area-normal'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaStacked,
- allowSelected: true,
- iconCls: 'area-stack'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaStackedPer,
- allowSelected: true,
- iconCls: 'area-pstack'
- },
- {
- group: 'menu-chart-group-scatter',
- type: Asc.c_oAscChartTypeSettings.scatter,
- allowSelected: true,
- iconCls: 'point-normal'
- },
- {
- group: 'menu-chart-group-stock',
- type: Asc.c_oAscChartTypeSettings.stock,
- allowSelected: true,
- iconCls: 'stock-normal'
- }
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, allowSelected: true, iconCls: 'surface-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, allowSelected: true, iconCls: 'surface-wireframe'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, allowSelected: true, iconCls: 'contour-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, allowSelected: true, iconCls: 'contour-wireframe'}
- ]),
- itemTemplate: _.template('')
- });
-
this.mnuTablePicker = new Common.UI.DimensionPicker({
el: $('#id-toolbar-menu-tablepicker'),
minRows: 8,
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 145a0b453..d407512fc 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -22,157 +22,93 @@
z-index: 1001;
}
- .loader-page {
+ .loadmask > .brendpanel {
width: 100%;
- height: 170px;
- bottom: 42%;
- position: absolute;
- text-align: center;
- line-height: 10px;
+ height: 56px;
+ background: #446995;
}
- .loader-logo {
- max-height: 160px;
- margin-bottom: 10px;
+ .loadmask > .brendpanel > div {
+ display: flex;
+ align-items: center;
}
- .loader-page-romb {
- width: 40px;
+ .loadmask > .brendpanel .spacer {
+ margin-left: auto;
+ }
+
+ .loadmask > .brendpanel .loading-logo {
+ padding: 0 24px 0 12px;
+ max-width: 200px;
+ height: 20px;
+ }
+
+ .loadmask > .brendpanel .loading-logo > img {
display: inline-block;
+ max-width: 100px;
+ max-height: 20px;
+ opacity: 0;
}
- .loader-page-text {
- width: 100%;
- bottom: 42%;
- position: absolute;
- text-align: center;
- color: #888;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- line-height: 20px;
+ .loadmask > .brendpanel .circle {
+ vertical-align: middle;
+ width: 20px;
+ height: 20px;
+ border-radius: 12px;
+ margin: 4px 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-loading {
- font-size: 14px;
+ .loadmask > .brendpanel .rect {
+ vertical-align: middle;
+ width: 50px;
+ height: 12px;
+ border-radius: 3px;
+ margin: 0 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-customer {
- font-size: 16px;
- margin-bottom: 5px;
+ .loadmask > .placeholder {
+ background: #fbfbfb;
+ width: 796px;
+ margin: 112px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
}
- .romb {
- width: 40px;
- height: 40px;
- -webkit-transform: rotate(135deg) skew(20deg, 20deg);
- -moz-transform: rotate(135deg) skew(20deg, 20deg);
- -ms-transform: rotate(135deg) skew(20deg, 20deg);
- -o-transform: rotate(135deg) skew(20deg, 20deg);
- position: absolute;
- background: red;
- border-radius: 6px;
- -webkit-animation: movedown 3s infinite ease;
- -moz-animation: movedown 3s infinite ease;
- -ms-animation: movedown 3s infinite ease;
- -o-animation: movedown 3s infinite ease;
- animation: movedown 3s infinite ease;
+ .loadmask > .placeholder > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
}
- #blue {
- z-index: 3;
- background: #55bce6;
- -webkit-animation-name: blue;
- -moz-animation-name: blue;
- -ms-animation-name: blue;
- -o-animation-name: blue;
- animation-name: blue;
+ @keyframes flickerAnimation {
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #red {
- z-index:1;
- background: #de7a59;
- -webkit-animation-name: red;
- -moz-animation-name: red;
- -ms-animation-name: red;
- -o-animation-name: red;
- animation-name: red;
+ @-o-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #green {
- z-index: 2;
- background: #a1cb5c;
- -webkit-animation-name: green;
- -moz-animation-name: green;
- -ms-animation-name: green;
- -o-animation-name: green;
- animation-name: green;
+ @-moz-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- @-webkit-keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0;}
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0; }
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @-webkit-keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @-webkit-keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
- }
-
- @keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #fff; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
+ @-webkit-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
@@ -228,49 +164,9 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('
') : '') : null;
+ logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
window.frameEditorId = params["frameEditorId"];
-
- if ( lang == 'de') loading = 'Ladevorgang...';
- else if ( lang == 'es') loading = 'Cargando...';
- else if ( lang == 'fr') loading = 'Chargement en cours...';
- else if ( lang == 'it') loading = 'Caricamento in corso...';
- else if ( lang == 'pt') loading = 'Carregando...';
- else if ( lang == 'ru') loading = 'Загрузка...';
- else if ( lang == 'sl') loading = 'Nalaganje...';
- else if ( lang == 'tr') loading = 'Yükleniyor...';
- else if ( lang == 'bg') loading = 'Зареждане...';
- else if ( lang == 'cs') loading = 'Nahrávám...';
- else if ( lang == 'hu') loading = 'Betöltés...';
- else if ( lang == 'ja') loading = '読み込み中...';
- else if ( lang == 'ko') loading = '로드 중...';
- else if ( lang == 'lv') loading = 'Ieladēšana ...';
- else if ( lang == 'nl') loading = 'Laden...';
- else if ( lang == 'pl') loading = 'Ładowanie...';
- else if ( lang == 'sk') loading = 'Nahrávam...';
- else if ( lang == 'uk') loading = 'Завантаження...';
- else if ( lang == 'vi') loading = 'Đang tải...';
- else if ( lang == 'zh') loading = '加载中...';
-
- if ( !stopLoading )
- document.write(
- '
+
+
@@ -299,7 +208,7 @@
-
+
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 45faf2f30..675be6f5b 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -23,157 +23,93 @@
z-index: 1001;
}
- .loader-page {
+ .loadmask > .brendpanel {
width: 100%;
- height: 170px;
- bottom: 42%;
- position: absolute;
- text-align: center;
- line-height: 10px;
+ height: 56px;
+ background: #446995;
}
- .loader-logo {
- max-height: 160px;
- margin-bottom: 10px;
+ .loadmask > .brendpanel > div {
+ display: flex;
+ align-items: center;
}
- .loader-page-romb {
- width: 40px;
+ .loadmask > .brendpanel .spacer {
+ margin-left: auto;
+ }
+
+ .loadmask > .brendpanel .loading-logo {
+ padding: 0 24px 0 12px;
+ max-width: 200px;
+ height: 20px;
+ }
+
+ .loadmask > .brendpanel .loading-logo > img {
display: inline-block;
+ max-width: 100px;
+ max-height: 20px;
+ opacity: 0;
}
- .loader-page-text {
- width: 100%;
- bottom: 42%;
- position: absolute;
- text-align: center;
- color: #888;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- line-height: 20px;
+ .loadmask > .brendpanel .circle {
+ vertical-align: middle;
+ width: 20px;
+ height: 20px;
+ border-radius: 12px;
+ margin: 4px 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-loading {
- font-size: 14px;
+ .loadmask > .brendpanel .rect {
+ vertical-align: middle;
+ width: 50px;
+ height: 12px;
+ border-radius: 3px;
+ margin: 0 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-customer {
- font-size: 16px;
- margin-bottom: 5px;
+ .loadmask > .placeholder {
+ background: #fbfbfb;
+ width: 796px;
+ margin: 112px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
}
- .romb {
- width: 40px;
- height: 40px;
- -webkit-transform: rotate(135deg) skew(20deg, 20deg);
- -moz-transform: rotate(135deg) skew(20deg, 20deg);
- -ms-transform: rotate(135deg) skew(20deg, 20deg);
- -o-transform: rotate(135deg) skew(20deg, 20deg);
- position: absolute;
- background: red;
- border-radius: 6px;
- -webkit-animation: movedown 3s infinite ease;
- -moz-animation: movedown 3s infinite ease;
- -ms-animation: movedown 3s infinite ease;
- -o-animation: movedown 3s infinite ease;
- animation: movedown 3s infinite ease;
+ .loadmask > .placeholder > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
}
- #blue {
- z-index: 3;
- background: #55bce6;
- -webkit-animation-name: blue;
- -moz-animation-name: blue;
- -ms-animation-name: blue;
- -o-animation-name: blue;
- animation-name: blue;
+ @keyframes flickerAnimation {
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #red {
- z-index:1;
- background: #de7a59;
- -webkit-animation-name: red;
- -moz-animation-name: red;
- -ms-animation-name: red;
- -o-animation-name: red;
- animation-name: red;
+ @-o-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #green {
- z-index: 2;
- background: #a1cb5c;
- -webkit-animation-name: green;
- -moz-animation-name: green;
- -ms-animation-name: green;
- -o-animation-name: green;
- animation-name: green;
+ @-moz-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- @-webkit-keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0;}
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0; }
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @-webkit-keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @-webkit-keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
- }
-
- @keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
+ @-webkit-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
@@ -227,54 +163,28 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('') : '') : null;
+ logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
window.frameEditorId = params["frameEditorId"];
-
- if ( lang == 'de') loading = 'Ladevorgang...';
- else if ( lang == 'es') loading = 'Cargando...';
- else if ( lang == 'fr') loading = 'Chargement en cours...';
- else if ( lang == 'it') loading = 'Caricamento in corso...';
- else if ( lang == 'pt') loading = 'Carregando...';
- else if ( lang == 'ru') loading = 'Загрузка...';
- else if ( lang == 'sl') loading = 'Nalaganje...';
- else if ( lang == 'tr') loading = 'Yükleniyor...';
- else if ( lang == 'bg') loading = 'Зареждане...';
- else if ( lang == 'cs') loading = 'Nahrávám...';
- else if ( lang == 'hu') loading = 'Betöltés...';
- else if ( lang == 'ja') loading = '読み込み中...';
- else if ( lang == 'ko') loading = '로드 중...';
- else if ( lang == 'lv') loading = 'Ieladēšana ...';
- else if ( lang == 'nl') loading = 'Laden...';
- else if ( lang == 'pl') loading = 'Ładowanie...';
- else if ( lang == 'sk') loading = 'Nahrávam...';
- else if ( lang == 'uk') loading = 'Завантаження...';
- else if ( lang == 'vi') loading = 'Đang tải...';
- else if ( lang == 'zh') loading = '加载中...';
-
- if ( !stopLoading )
- document.write(
- '
+
+
+
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
new file mode 100644
index 000000000..3d0f4b30e
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html
@@ -0,0 +1,303 @@
+
+
+
+ ONLYOFFICE Documents
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
new file mode 100644
index 000000000..0d2c66fa9
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -0,0 +1,322 @@
+
+
+
+ ONLYOFFICE Document Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
diff --git a/apps/documenteditor/mobile/index.html.deploy b/apps/documenteditor/mobile/index.html.deploy
index dc911efec..6eb804dc5 100644
--- a/apps/documenteditor/mobile/index.html.deploy
+++ b/apps/documenteditor/mobile/index.html.deploy
@@ -15,172 +15,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('' +
- '
');
@@ -278,8 +174,21 @@
+ ' +
- ((logo!==null) ? logo :
- '
' +
- '' +
- '' +
- '' +
- '' +
- '
') +
- '' + customer +
- '
' +
- '' + loading + '
' +
- '
@@ -299,7 +208,7 @@
-
+
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 45faf2f30..675be6f5b 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -23,157 +23,93 @@
z-index: 1001;
}
- .loader-page {
+ .loadmask > .brendpanel {
width: 100%;
- height: 170px;
- bottom: 42%;
- position: absolute;
- text-align: center;
- line-height: 10px;
+ height: 56px;
+ background: #446995;
}
- .loader-logo {
- max-height: 160px;
- margin-bottom: 10px;
+ .loadmask > .brendpanel > div {
+ display: flex;
+ align-items: center;
}
- .loader-page-romb {
- width: 40px;
+ .loadmask > .brendpanel .spacer {
+ margin-left: auto;
+ }
+
+ .loadmask > .brendpanel .loading-logo {
+ padding: 0 24px 0 12px;
+ max-width: 200px;
+ height: 20px;
+ }
+
+ .loadmask > .brendpanel .loading-logo > img {
display: inline-block;
+ max-width: 100px;
+ max-height: 20px;
+ opacity: 0;
}
- .loader-page-text {
- width: 100%;
- bottom: 42%;
- position: absolute;
- text-align: center;
- color: #888;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- line-height: 20px;
+ .loadmask > .brendpanel .circle {
+ vertical-align: middle;
+ width: 20px;
+ height: 20px;
+ border-radius: 12px;
+ margin: 4px 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-loading {
- font-size: 14px;
+ .loadmask > .brendpanel .rect {
+ vertical-align: middle;
+ width: 50px;
+ height: 12px;
+ border-radius: 3px;
+ margin: 0 10px;
+ background: rgba(255, 255, 255, 0.2);
}
- .loader-page-text-customer {
- font-size: 16px;
- margin-bottom: 5px;
+ .loadmask > .placeholder {
+ background: #fbfbfb;
+ width: 796px;
+ margin: 112px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
}
- .romb {
- width: 40px;
- height: 40px;
- -webkit-transform: rotate(135deg) skew(20deg, 20deg);
- -moz-transform: rotate(135deg) skew(20deg, 20deg);
- -ms-transform: rotate(135deg) skew(20deg, 20deg);
- -o-transform: rotate(135deg) skew(20deg, 20deg);
- position: absolute;
- background: red;
- border-radius: 6px;
- -webkit-animation: movedown 3s infinite ease;
- -moz-animation: movedown 3s infinite ease;
- -ms-animation: movedown 3s infinite ease;
- -o-animation: movedown 3s infinite ease;
- animation: movedown 3s infinite ease;
+ .loadmask > .placeholder > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
}
- #blue {
- z-index: 3;
- background: #55bce6;
- -webkit-animation-name: blue;
- -moz-animation-name: blue;
- -ms-animation-name: blue;
- -o-animation-name: blue;
- animation-name: blue;
+ @keyframes flickerAnimation {
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #red {
- z-index:1;
- background: #de7a59;
- -webkit-animation-name: red;
- -moz-animation-name: red;
- -ms-animation-name: red;
- -o-animation-name: red;
- animation-name: red;
+ @-o-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #green {
- z-index: 2;
- background: #a1cb5c;
- -webkit-animation-name: green;
- -moz-animation-name: green;
- -ms-animation-name: green;
- -o-animation-name: green;
- animation-name: green;
+ @-moz-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- @-webkit-keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0;}
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0; }
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @-webkit-keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @-webkit-keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
- }
-
- @keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
+ @-webkit-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
@@ -227,54 +163,28 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('' +
- '
');
+ ' +
- ((logo!==null) ? logo :
- '
' +
- '' +
- '' +
- '' +
- '' +
- '
') +
- '' + customer +
- '
' +
- '' + loading + '
' +
- '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
new file mode 100644
index 000000000..0d2c66fa9
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -0,0 +1,322 @@
+
+
+
+ ');
+
// if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
// Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
},
@@ -619,6 +622,8 @@ define([
}
Common.Gateway.documentReady();
+
+ $('.doc-placeholder').remove();
},
onLicenseChanged: function(params) {
diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html
index 5f3b6495a..0a15273f4 100644
--- a/apps/documenteditor/mobile/index.html
+++ b/apps/documenteditor/mobile/index.html
@@ -16,172 +16,107 @@
+