Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into hotfix/v4.3.2

Browse source
This commit is contained in:
Alexey Golubev 2017-04-17 15:35:52 +03:00 committed by GitHub
parent a79bfcabc5 5230fd796a
commit 93b75a8fcf
149 changed files with 16350 additions and 17286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml Normal file
View file

@ -0,0 +1,10 @@
dist: trusty
language: node_js
node_js:
- '6'
before_install: npm install -g grunt-cli
before_script:
- cd build
script:
- npm install
- grunt --level=ADVANCED

2
apps/common/main/lib/component/ComboBox.js
View file

@ -547,7 +547,7 @@ define([
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>'
].join(''), {
].join(''))({
items: this.store.toJSON(),
scope: this
}));

2
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -353,7 +353,7 @@ define([
'<li id="<%= item.id %>">',
'<a class="font-item" tabindex="-1" type="menuitem" style="vertical-align:middle; margin: 0 0 0 -10px; height:<%=scope.getListItemHeight()%>px;"/>',
'</li>'
].join(''), {
].join(''))({
item: item.attributes,
scope: this
}));

12
apps/common/main/lib/component/ComboDataView.js
View file

@ -59,7 +59,8 @@ define([
enableKeyEvents : false,
beforeOpenHandler : null,
additionalMenuItems : null,
showLast: true
showLast: true,
minWidth: -1
},
template: _.template([
@ -86,6 +87,7 @@ define([
this.rootHeight = 0;
this.rendered = false;
this.needFillComboView = false;
this.minWidth = this.options.minWidth;
this.fieldPicker = new Common.UI.DataView({
cls: 'field-picker',
@ -215,6 +217,8 @@ define([
width = this.cmpEl.width(),
height = this.cmpEl.height();
if (width < this.minWidth) return;
if (this.rootWidth != width || this.rootHeight != height) {
this.rootWidth = width;
this.rootHeight = height;
@ -420,7 +424,7 @@ define([
var indexRec = store.indexOf(record),
countRec = store.length,
maxViewCount = Math.floor((fieldPickerEl.width()) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
maxViewCount = Math.floor(Math.max(fieldPickerEl.width(), me.minWidth) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
(me.itemBorderLeft || 0) + (me.itemBorderRight || 0))),
newStyles = [];
@ -452,6 +456,10 @@ define([
}
},
clearComboView: function() {
this.fieldPicker.store.reset([]);
},
selectByIndex: function(index) {
if (index < 0)
this.fieldPicker.deselectAll();

12
apps/common/main/lib/component/MultiSliderGradient.js
View file

@ -150,6 +150,18 @@ define([
}
style = Common.Utils.String.format('linear-gradient(to right, {0} {1}%, {2} {3}%)', this.colorValues[0], this.getValue(0), this.colorValues[1], this.getValue(1));
this.trackEl.css('background', style);
},
sortThumbs: function() {
var recalc_indexes = Common.UI.MultiSlider.prototype.sortThumbs.call(this),
new_colors = [],
me = this;
_.each (recalc_indexes, function(recalc_index) {
new_colors.push(me.colorValues[recalc_index]);
});
this.colorValues = new_colors;
this.trigger('sortthumbs', me, recalc_indexes);
return recalc_indexes;
}
});
});

38
apps/common/main/lib/component/Slider.js
View file

@ -338,16 +338,21 @@ define([
e.preventDefault();
e.stopPropagation();
var index = e.data,
var index = e.data.index,
lastValue = me.thumbs[index].value,
minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
need_sort = position < minValue || position > maxValue,
pos = Math.max(0, Math.min(100, position)),
value = pos/me.delta + me.minValue;
me.setThumbPosition(index, pos);
me.thumbs[index].value = value;
if (need_sort)
me.sortThumbs();
$(document).off('mouseup', onMouseUp);
$(document).off('mousemove', onMouseMove);
@ -362,16 +367,21 @@ define([
e.preventDefault();
e.stopPropagation();
var index = e.data,
var index = e.data.index,
lastValue = me.thumbs[index].value,
minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
need_sort = position < minValue || position > maxValue,
pos = Math.max(0, Math.min(100, position)),
value = pos/me.delta + me.minValue;
me.setThumbPosition(index, pos);
me.thumbs[index].value = value;
if (need_sort)
me.sortThumbs();
if (Math.abs(value-lastValue)>0.001)
me.trigger('change', me, value, lastValue);
};
@ -379,7 +389,7 @@ define([
var onMouseDown = function (e) {
if ( me.disabled ) return;
var index = e.data,
var index = e.data.index,
thumb = me.thumbs[index].thumb;
me._dragstart = e.pageX*Common.Utils.zoom() - thumb.offset().left - thumb.width()/2;
@ -389,8 +399,8 @@ define([
(index == idx) ? item.thumb.css('z-index', 500) : item.thumb.css('z-index', '');
});
$(document).on('mouseup', null, index, onMouseUp);
$(document).on('mousemove', null, index, onMouseMove);
$(document).on('mouseup', null, e.data, onMouseUp);
$(document).on('mousemove', null, e.data, onMouseMove);
};
var onTrackMouseDown = function (e) {
@ -441,7 +451,7 @@ define([
index: index
});
me.setValue(index, me.options.values[index]);
thumb.on('mousedown', null, index, onMouseDown);
thumb.on('mousedown', null, me.thumbs[index], onMouseDown);
});
me.setActiveThumb(0, true);
@ -489,6 +499,18 @@ define([
if (disabled !== this.disabled)
this.cmpEl.toggleClass('disabled', disabled);
this.disabled = disabled;
},
sortThumbs: function() {
this.thumbs.sort(function(a, b) {
return (a.position - b.position);
});
var recalc_indexes = [];
_.each (this.thumbs, function(thumb, index) {
recalc_indexes.push(thumb.index);
thumb.index = index;
});
return recalc_indexes;
}
});
});

4
apps/common/main/lib/component/Window.js
View file

@ -421,7 +421,7 @@ define([
_.extend(options, {
cls: 'alert',
onprimary: onKeyDown,
tpl: _.template(template, options)
tpl: _.template(template)(options)
});
var win = new Common.UI.Window(options),
@ -556,7 +556,7 @@ define([
render : function() {
var renderto = this.initConfig.renderTo || document.body;
$(renderto).append(
_.template(template, this.initConfig)
_.template(template)(this.initConfig)
);
this.$window = $('#' + this.initConfig.id);

2
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file

@ -71,7 +71,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this.toggleGroup = _options.toggleGroup;

8
apps/common/main/lib/view/Chat.js
View file

@ -67,7 +67,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -82,7 +82,7 @@ define([
templateMsgList: _.template('<ul>' +
'<% _.each(messages, function(item) { %>' +
'<%= _.template(msgtpl, {msg: item, scope: scope}) %>' +
'<%= _.template(msgtpl)({msg: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -162,7 +162,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsers) {
this.panelUsers.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsers.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsers.scroller.update({minScrollbarLength : 25, alwaysVisibleY: true});
}
},
@ -186,7 +186,7 @@ define([
var content = this.panelMessages.find('ul');
if (content && content.length) {
this._prepareMessage(m);
content.append(_.template(this.tplMsg, {msg: m, scope: this}));
content.append(_.template(this.tplMsg)({msg: m, scope: this}));
// scroll to end

2
apps/common/main/lib/view/Comments.js
View file

@ -98,7 +98,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};

2
apps/common/main/lib/view/CopyWarningDialog.js
View file

@ -83,7 +83,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

4
apps/common/main/lib/view/DocumentAccessDialog.js
View file

@ -48,7 +48,7 @@ define([
var _options = {};
_.extend(_options, {
title: this.textTitle,
width: 850,
width: 600,
height: 536,
header: true
}, options);
@ -57,7 +57,7 @@ define([
'<div id="id-sharing-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.settingsurl = options.settingsurl || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._chartData = null;

2
apps/common/main/lib/view/ExternalMergeEditor.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._mergeData = null;

2
apps/common/main/lib/view/ImageFromUrlDialog.js
View file

@ -65,7 +65,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

2
apps/common/main/lib/view/InsertTableDialog.js
View file

@ -73,7 +73,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

2
apps/common/main/lib/view/OpenDialog.js
View file

@ -93,7 +93,7 @@ define([
this.codepages = options.codepages;
this.settings = options.settings;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},

2
apps/common/main/lib/view/Plugins.js
View file

@ -225,7 +225,7 @@ define([
'<% } %>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.url = options.url || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/common/main/lib/view/RenameDialog.js
View file

@ -66,7 +66,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

4
apps/common/main/lib/view/ReviewChanges.js
View file

@ -80,7 +80,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};
@ -441,7 +441,7 @@ define([
var el = $(this.el),
me = this;
el.addClass('review-changes');
el.html(_.template(this.template, {
el.html(_.template(this.template)({
scope: this
}));

2
apps/common/main/lib/view/SearchDialog.js
View file

@ -105,7 +105,7 @@
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

1
apps/documenteditor/embed/index.html
View file

@ -323,7 +323,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>

1
apps/documenteditor/embed/index.html.deploy
View file

@ -314,7 +314,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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>

4
apps/documenteditor/main/app.js
View file

@ -56,7 +56,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@ -112,8 +111,7 @@ require.config({
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

9
apps/documenteditor/main/app/controller/Main.js
View file

@ -231,6 +231,15 @@ define([
});
this.initNames(); //for shapes
Common.util.Shortcuts.delegateShortcuts({
shortcuts: {
'command+s,ctrl+s': _.bind(function (e) {
e.preventDefault();
e.stopPropagation();
}, this)
}
});
}
},

9
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -733,7 +733,7 @@ define([
var styleRec = listStyle.menuPicker.store.findWhere({
title: name
});
this._state.prstyle = (listStyle.menuPicker.store.length>0) ? name : undefined;
this._state.prstyle = (listStyle.menuPicker.store.length>0 || window.styles_loaded) ? name : undefined;
listStyle.menuPicker.selectRecord(styleRec);
listStyle.resumeEvents();
@ -1892,7 +1892,7 @@ define([
me._state.prstyle = title;
style.put_Name(title);
characterStyle.put_Name(title + '_character');
style.put_Next(nextStyle.asc_getName());
style.put_Next((nextStyle) ? nextStyle.asc_getName() : null);
me.api.asc_AddNewStyle(style);
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@ -2516,7 +2516,7 @@ define([
store: this.getApplication().getCollection('Common.Collections.TextArt'),
parentMenu: this.toolbar.mnuInsertTextArt.menu,
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
@ -2630,7 +2630,8 @@ define([
if (self._state.prstyle) styleRec = listStyles.menuPicker.store.findWhere({title: self._state.prstyle});
listStyles.fillComboView((styleRec) ? styleRec : listStyles.menuPicker.store.at(0), true);
Common.NotificationCenter.trigger('edit:complete', this);
}
} else if (listStyles.rendered)
listStyles.clearComboView();
window.styles_loaded = true;
},

2
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -81,7 +81,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.api = this.options.api;
Common.UI.Window.prototype.initialize.call(this, this.options);

2
apps/documenteditor/main/app/view/MailMergeRecepients.js
View file

@ -54,7 +54,7 @@ define([
'<div id="id-mail-recepients-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.fileChoiceUrl = options.fileChoiceUrl || '';
Common.UI.Window.prototype.initialize.call(this, _options);

2
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
View file

@ -55,7 +55,7 @@ define([
'<div id="id-mail-merge-folder-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.mergeFolderUrl = options.mergeFolderUrl || '';
this.mergedFileUrl = options.mergedFileUrl || '';

2
apps/documenteditor/main/app/view/PageMarginsDialog.js
View file

@ -89,7 +89,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

2
apps/documenteditor/main/app/view/PageSizeDialog.js
View file

@ -79,7 +79,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

12
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1341,6 +1341,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

6
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -96,7 +96,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -436,7 +436,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsersList) {
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
}
},
@ -566,7 +566,7 @@ define([
label: this.labelSelect,
btns: {ok: this.btnOk, cancel: this.btnCancel}
});
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

11
apps/documenteditor/main/app/view/StyleTitleDialog.js
View file

@ -70,7 +70,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -107,10 +107,11 @@ define([
menuStyle : 'width: 100%; max-height: 290px;',
editable : false,
cls : 'input-group-nr',
data : this.options.formats
data : this.options.formats,
disabled : (this.options.formats.length==0)
});
this.cmbNextStyle.setValue(this.options.formats[0].value);
if (this.options.formats.length>0)
this.cmbNextStyle.setValue(this.options.formats[0].value);
},
show: function() {
@ -129,7 +130,7 @@ define([
getNextStyle: function () {
var me = this;
return me.cmbNextStyle.getValue();
return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
},
onBtnClick: function(event) {

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -916,6 +916,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

2
apps/documenteditor/main/app_dev.js
View file

@ -56,7 +56,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -125,7 +124,6 @@ require([
'locale',
'jszip',
'jsziputils',
'jsrsasign',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

2
apps/documenteditor/mobile/app-dev.js
View file

@ -53,7 +53,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
extendes : 'common/mobile/utils/extendes',
@ -120,7 +119,6 @@ require([
'locale',
'jszip',
'jsziputils',
'jsrsasign',
'sockjs'
], function (Backbone, Framework7, Core) {
Backbone.history.start();

4
apps/documenteditor/mobile/app.js
View file

@ -53,7 +53,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@ -105,8 +104,7 @@ require.config({
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

3
apps/documenteditor/mobile/app/template/AddImage.template
View file

@ -40,12 +40,13 @@
</div>
<div class="page" id="addimage-url">
<div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div>
<% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block">
<ul>
<li>
<div id="addimage-link-url" class="item-content">
<div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>">
</div>

2
apps/documenteditor/mobile/app/view/Settings.js
View file

@ -175,7 +175,7 @@ define([
'</div>',
'</label>',
'</li>'
].join(''), {
].join(''))({
android: Framework7.prototype.device.android,
item: size,
index: index,

2
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file

@ -203,7 +203,7 @@ define([
'<% }); %>',
'</ul>',
'<% }); %>'
].join(''), {
].join(''))({
styles: styles
});

2
apps/documenteditor/mobile/app/view/edit/EditTable.js
View file

@ -138,7 +138,7 @@ define([
'</div>',
'<% }); %>',
'</div>'
].join(''), {
].join(''))({
styles: styles
});

6
apps/documenteditor/sdk_dev_scripts.js
View file

@ -19,9 +19,10 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/common/AdvancedOptions.js",
"../../../../sdkjs/common/FontsFreeType/font_engine.js",
"../../../../sdkjs/common/FontsFreeType/FontFile.js",
"../../../../sdkjs/common/FontsFreeType/font_map.js",
"../../../../sdkjs/common/FontsFreeType/font_map.js",
"../../../../sdkjs/common/FontsFreeType/FontManager.js",
"../../../../sdkjs/word/Editor/FontClassification.js",
"../../../../sdkjs/common/FontsFreeType/character.js",
"../../../../sdkjs/common/Drawings/Metafile.js",
"../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
"../../../../sdkjs/common/Drawings/WorkEvents.js",
@ -86,10 +87,13 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js",
"../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js",
"../../../../sdkjs/word/Editor/CollaborativeEditing.js",
"../../../../sdkjs/word/Editor/DocumentContentElementBase.js",
"../../../../sdkjs/word/Editor/StructuredDocumentTags/BlockLevel.js",
"../../../../sdkjs/word/Editor/Comments.js",
"../../../../sdkjs/word/Editor/CommentsChanges.js",
"../../../../sdkjs/word/Editor/Styles.js",
"../../../../sdkjs/word/Editor/StylesChanges.js",
"../../../../sdkjs/word/Editor/RevisionsChange.js",
"../../../../sdkjs/word/Editor/ParagraphContent.js",
"../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js",
"../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js",

1
apps/presentationeditor/embed/index.html
View file

@ -325,7 +325,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>

1
apps/presentationeditor/embed/index.html.deploy
View file

@ -318,7 +318,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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>

4
apps/presentationeditor/main/app.js
View file

@ -55,7 +55,6 @@ require.config({
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api',
@ -109,8 +108,7 @@ require.config({
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

8
apps/presentationeditor/main/app/controller/Main.js
View file

@ -221,6 +221,14 @@ define([
});
this.initNames();
Common.util.Shortcuts.delegateShortcuts({
shortcuts: {
'command+s,ctrl+s': _.bind(function (e) {
e.preventDefault();
e.stopPropagation();
}, this)
}
});
}
},

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1718,7 +1718,7 @@ define([
store: this.getApplication().getCollection('Common.Collections.TextArt'),
parentMenu: this.toolbar.mnuInsertTextArt.menu,
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {

2
apps/presentationeditor/main/app/view/DocumentPreview.js
View file

@ -100,7 +100,7 @@ define([
render: function () {
var el = $(this.el),
me = this;
el.html(_.template(this.template, {
el.html(_.template(this.template)({
scope: this
}));

3
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -54,7 +54,8 @@ define([
formats: [[
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
{name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX}
{name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX},
{name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP}
]],

2
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -103,7 +103,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.slides = this.options.slides;
this.api = this.options.api;

12
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -1234,6 +1234,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

12
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -755,6 +755,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.FillItems.push(this.sldrGradient);
},

2
apps/presentationeditor/main/app/view/SlideSizeSettings.js
View file

@ -87,7 +87,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

2
apps/presentationeditor/main/app/view/SlideshowSettings.js
View file

@ -68,7 +68,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.spinners = [];
this._noApply = false;

4
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -80,7 +80,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -338,7 +338,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsersList) {
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
}
},

12
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -1224,6 +1224,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

2
apps/presentationeditor/main/app_dev.js
View file

@ -55,7 +55,6 @@ require.config({
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -122,7 +121,6 @@ require([
'gateway',
'locale',
'jsziputils',
'jsrsasign',
'sockjs',
'xregexp',
'underscore'

BIN
apps/presentationeditor/main/resources/img/docformat.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
apps/presentationeditor/main/resources/img/docformat@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 29 KiB

3
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -189,7 +189,7 @@
background-repeat: no-repeat;
background-position: 0 0;
.background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 714px);
.background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 918px);
.icon-document-format(@shift-x, @shift-y: 0) {
background-position: @shift-x @shift-y;
@ -201,6 +201,7 @@
&.pptx {.icon-document-format(-102px);}
&.pdf {.icon-document-format(-306px);}
&.odp {.icon-document-format(-816px);}
}
}
}

2
apps/presentationeditor/mobile/app-dev.js
View file

@ -54,7 +54,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
extendes : 'common/mobile/utils/extendes',
@ -121,7 +120,6 @@ require([
'locale',
'jszip',
'jsziputils',
'jsrsasign',
'sockjs'
], function (Backbone, Framework7, Core) {
Backbone.history.start();

4
apps/presentationeditor/mobile/app.js
View file

@ -54,7 +54,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api',
@ -106,8 +105,7 @@ require.config({
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

3
apps/presentationeditor/mobile/app/template/AddImage.template
View file

@ -40,12 +40,13 @@
</div>
<div class="page" id="addimage-url">
<div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div>
<% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block">
<ul>
<li>
<div id="addimage-link-url" class="item-content">
<div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>">
</div>

12
apps/presentationeditor/mobile/app/template/Settings.template
View file

@ -196,6 +196,18 @@
</div>
</a>
</li>
<li>
<a data-format="131" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-format-odp"></i>
</div>
<div class="item-inner">
<div class="item-title">ODP</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>

2
apps/presentationeditor/mobile/app/view/add/AddSlide.js
View file

@ -123,7 +123,7 @@ define([
'<% }); %>',
'</ul>',
'<% }); %>'
].join(''), {
].join(''))({
layouts: layouts
});

2
apps/presentationeditor/mobile/app/view/edit/EditChart.js
View file

@ -203,7 +203,7 @@ define([
'<% }); %>',
'</ul>',
'<% }); %>'
].join(''), {
].join(''))({
styles: styles
});

6
apps/presentationeditor/mobile/app/view/edit/EditSlide.js
View file

@ -235,7 +235,7 @@ define([
'<% }); %>',
'</ul>',
'<% }); %>'
].join(''), {
].join(''))({
layouts: layouts
});
@ -268,7 +268,7 @@ define([
'<% }); %>',
'</div>',
'<% }); %>'
].join(''), {
].join(''))({
themes: themes
});
@ -291,7 +291,7 @@ define([
'</label>',
'</li>',
'<% }); %>'
].join(''), {
].join(''))({
android : Common.SharedSettings.get('android'),
types: _arrCurrentEffectTypes
});

2
apps/presentationeditor/mobile/app/view/edit/EditTable.js
View file

@ -138,7 +138,7 @@ define([
'</div>',
'<% }); %>',
'</div>'
].join(''), {
].join(''))({
styles: styles
});

6
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

File diff suppressed because one or more lines are too long

6
apps/presentationeditor/mobile/resources/css/app-material.css
View file

File diff suppressed because one or more lines are too long

5
apps/presentationeditor/mobile/resources/less/ios/_icons.less
View file

@ -363,4 +363,9 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-238 240 22 22" style="enable-background:new -238 240 22 22;" xml:space="preserve" fill="@{themeColor}"><g><path id="XMLID_2_" d="M-236,261h18v-17l-3.9791718-4H-236V261z M-219,248v12h-16v-19h12l4,4V248z"/></g><g><path d="M-228.8226929,250.8646851c0.137085-0.060791,0.2341919-0.2302246,0.3131104-0.3647461 c0.0792847-0.1351929,0.0861816-0.2935181,0.0861816-0.473938c0-0.2221069-0.0613403-0.4186401-0.1723633-0.5601807 c-0.1102905-0.1405029-0.296875-0.2628784-0.4628906-0.2931519c-0.1210938-0.0233154-0.2396851-0.0012817-0.4535522,0.0090942 l-0.3115234,0.010376v1.7925415h0.4523926C-228.9815063,250.9927368-228.9586182,250.9249878-228.8226929,250.8646851z"/><path d="M-233,256.1141357l7.333313,1.3553467V245L-233,246.3268433V256.1141357z M-230.8660889,248.2818604l1.4968872-0.0977783 c0.6077881-0.0397339,0.9075317-0.0557251,1.1018066-0.0071411c0.3032227,0.0736084,0.637207,0.2349854,0.8483276,0.538147 c0.2138672,0.3070679,0.3555908,0.7592163,0.3555908,1.262085c0,0.3878784-0.0623169,0.7130737-0.1862793,0.9741211 c-0.1230469,0.2590942-0.2780151,0.4591064-0.4640503,0.6001587c-0.18396,0.1394653-0.3991089,0.2700195-0.5587769,0.3272705 c-0.3145752,0.0774536-0.5286865,0.1747437-0.9802856,0.1508179h-0.5708618v1.9562378l-1.0423584-0.1081543V248.2818604z"/><path d="M-221.7266846,247H-225v9h3.2733154C-221.3253479,256-221,255.6746521-221,255.2733154v-7.5466309 C-221,247.3253479-221.3253479,247-221.7266846,247z"/></g></svg>');
}
&.icon-format-odp {
width: 22px;
height: 22px;
.encoded-svg-background('<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-286 409.89 22 22" style="enable-background:new -286 409.89 22 22;" xml:space="preserve" fill="@{themeColor}"><g><path id="XMLID_2_" d="M-284,430.89h18v-17l-3.979-4H-284V430.89z M-267,417.89v12h-16v-19h12l4,4V417.89z"/></g><path d="M-281.655,419.661c0,0,1.036-1.266,3.529-1.381c2.493-0.115,3.107,0.499,3.107,0.499s1.072-0.873,2.634-0.984 c1.473-0.106,2.244,0.134,3.657,0.639c-3.107-0.038-5.408,1.189-6.022,1.956C-276.17,419.163-278.817,418.817-281.655,419.661z"/><path d="M-278.663,415.979c1.458-0.767,2.864-0.857,5.063,0c1.189-0.652,3.414-0.307,4.68,0.269c-3.145-0.23-4.104,0.422-4.68,0.69 C-274.367,416.056-276.86,415.595-278.663,415.979z"/><g><path d="M-281.721,425.011c0-0.465,0.07-0.855,0.209-1.172c0.104-0.232,0.246-0.441,0.425-0.626s0.376-0.322,0.59-0.411 c0.285-0.121,0.613-0.181,0.985-0.181c0.673,0,1.212,0.208,1.616,0.626c0.404,0.418,0.606,0.998,0.606,1.742 c0,0.737-0.2,1.314-0.601,1.731c-0.401,0.417-0.938,0.625-1.608,0.625c-0.679,0-1.22-0.207-1.621-0.622 C-281.521,426.31-281.721,425.739-281.721,425.011z M-280.771,424.981c0,0.517,0.119,0.909,0.358,1.176 c0.239,0.268,0.542,0.4,0.91,0.4c0.368,0,0.669-0.132,0.905-0.397c0.236-0.265,0.354-0.662,0.354-1.191 c0-0.523-0.115-0.914-0.344-1.172s-0.535-0.387-0.915-0.387c-0.38,0-0.687,0.131-0.919,0.392 C-280.654,424.062-280.771,424.455-280.771,424.981z"/><path d="M-276.573,422.699h1.686c0.38,0,0.67,0.029,0.87,0.088c0.267,0.079,0.498,0.219,0.689,0.421 c0.191,0.201,0.336,0.448,0.436,0.74s0.15,0.651,0.15,1.079c0,0.377-0.047,0.7-0.141,0.973c-0.114,0.333-0.277,0.602-0.489,0.808 c-0.16,0.155-0.376,0.277-0.648,0.364c-0.204,0.064-0.476,0.097-0.816,0.097h-1.736V422.699z M-275.65,423.472v3.026h0.689 c0.257,0,0.443-0.015,0.558-0.044c0.149-0.037,0.274-0.101,0.373-0.19c0.099-0.089,0.18-0.236,0.241-0.44 c0.062-0.205,0.094-0.483,0.094-0.837s-0.031-0.624-0.094-0.813c-0.062-0.189-0.149-0.337-0.262-0.442 c-0.112-0.106-0.254-0.178-0.427-0.215c-0.129-0.029-0.381-0.044-0.757-0.044H-275.65z"/><path d="M-271.96,427.268v-4.569h1.479c0.562,0,0.927,0.023,1.098,0.069c0.262,0.068,0.48,0.218,0.657,0.447 s0.265,0.525,0.265,0.89c0,0.28-0.051,0.516-0.152,0.707s-0.231,0.342-0.388,0.45c-0.157,0.109-0.316,0.182-0.479,0.217 c-0.221,0.044-0.539,0.065-0.957,0.065h-0.602v1.724H-271.96z M-271.038,423.472v1.297h0.505c0.363,0,0.606-0.024,0.729-0.072 c0.122-0.048,0.219-0.122,0.288-0.225c0.069-0.102,0.104-0.22,0.104-0.354c0-0.167-0.049-0.304-0.146-0.412 c-0.098-0.107-0.222-0.176-0.371-0.202c-0.109-0.021-0.331-0.031-0.663-0.031H-271.038z"/></g></svg>');
}
}

5
apps/presentationeditor/mobile/resources/less/material/_icons.less
View file

@ -333,6 +333,11 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-238 240 22 22" style="enable-background:new -238 240 22 22;" xml:space="preserve" fill="@{themeColor}"><g><path id="XMLID_2_" d="M-236,261h18v-17l-3.9791718-4H-236V261z M-219,248v12h-16v-19h12l4,4V248z"/></g><g><path d="M-228.8226929,250.8646851c0.137085-0.060791,0.2341919-0.2302246,0.3131104-0.3647461 c0.0792847-0.1351929,0.0861816-0.2935181,0.0861816-0.473938c0-0.2221069-0.0613403-0.4186401-0.1723633-0.5601807 c-0.1102905-0.1405029-0.296875-0.2628784-0.4628906-0.2931519c-0.1210938-0.0233154-0.2396851-0.0012817-0.4535522,0.0090942 l-0.3115234,0.010376v1.7925415h0.4523926C-228.9815063,250.9927368-228.9586182,250.9249878-228.8226929,250.8646851z"/><path d="M-233,256.1141357l7.333313,1.3553467V245L-233,246.3268433V256.1141357z M-230.8660889,248.2818604l1.4968872-0.0977783 c0.6077881-0.0397339,0.9075317-0.0557251,1.1018066-0.0071411c0.3032227,0.0736084,0.637207,0.2349854,0.8483276,0.538147 c0.2138672,0.3070679,0.3555908,0.7592163,0.3555908,1.262085c0,0.3878784-0.0623169,0.7130737-0.1862793,0.9741211 c-0.1230469,0.2590942-0.2780151,0.4591064-0.4640503,0.6001587c-0.18396,0.1394653-0.3991089,0.2700195-0.5587769,0.3272705 c-0.3145752,0.0774536-0.5286865,0.1747437-0.9802856,0.1508179h-0.5708618v1.9562378l-1.0423584-0.1081543V248.2818604z"/><path d="M-221.7266846,247H-225v9h3.2733154C-221.3253479,256-221,255.6746521-221,255.2733154v-7.5466309 C-221,247.3253479-221.3253479,247-221.7266846,247z"/></g></svg>');
}
&.icon-format-odp {
width: 22px;
height: 22px;
.encoded-svg-background('<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-286 409.89 22 22" style="enable-background:new -286 409.89 22 22;" xml:space="preserve" fill="@{themeColor}"><g><path id="XMLID_2_" d="M-284,430.89h18v-17l-3.979-4H-284V430.89z M-267,417.89v12h-16v-19h12l4,4V417.89z"/></g><path d="M-281.655,419.661c0,0,1.036-1.266,3.529-1.381c2.493-0.115,3.107,0.499,3.107,0.499s1.072-0.873,2.634-0.984 c1.473-0.106,2.244,0.134,3.657,0.639c-3.107-0.038-5.408,1.189-6.022,1.956C-276.17,419.163-278.817,418.817-281.655,419.661z"/><path d="M-278.663,415.979c1.458-0.767,2.864-0.857,5.063,0c1.189-0.652,3.414-0.307,4.68,0.269c-3.145-0.23-4.104,0.422-4.68,0.69 C-274.367,416.056-276.86,415.595-278.663,415.979z"/><g><path d="M-281.721,425.011c0-0.465,0.07-0.855,0.209-1.172c0.104-0.232,0.246-0.441,0.425-0.626s0.376-0.322,0.59-0.411 c0.285-0.121,0.613-0.181,0.985-0.181c0.673,0,1.212,0.208,1.616,0.626c0.404,0.418,0.606,0.998,0.606,1.742 c0,0.737-0.2,1.314-0.601,1.731c-0.401,0.417-0.938,0.625-1.608,0.625c-0.679,0-1.22-0.207-1.621-0.622 C-281.521,426.31-281.721,425.739-281.721,425.011z M-280.771,424.981c0,0.517,0.119,0.909,0.358,1.176 c0.239,0.268,0.542,0.4,0.91,0.4c0.368,0,0.669-0.132,0.905-0.397c0.236-0.265,0.354-0.662,0.354-1.191 c0-0.523-0.115-0.914-0.344-1.172s-0.535-0.387-0.915-0.387c-0.38,0-0.687,0.131-0.919,0.392 C-280.654,424.062-280.771,424.455-280.771,424.981z"/><path d="M-276.573,422.699h1.686c0.38,0,0.67,0.029,0.87,0.088c0.267,0.079,0.498,0.219,0.689,0.421 c0.191,0.201,0.336,0.448,0.436,0.74s0.15,0.651,0.15,1.079c0,0.377-0.047,0.7-0.141,0.973c-0.114,0.333-0.277,0.602-0.489,0.808 c-0.16,0.155-0.376,0.277-0.648,0.364c-0.204,0.064-0.476,0.097-0.816,0.097h-1.736V422.699z M-275.65,423.472v3.026h0.689 c0.257,0,0.443-0.015,0.558-0.044c0.149-0.037,0.274-0.101,0.373-0.19c0.099-0.089,0.18-0.236,0.241-0.44 c0.062-0.205,0.094-0.483,0.094-0.837s-0.031-0.624-0.094-0.813c-0.062-0.189-0.149-0.337-0.262-0.442 c-0.112-0.106-0.254-0.178-0.427-0.215c-0.129-0.029-0.381-0.044-0.757-0.044H-275.65z"/><path d="M-271.96,427.268v-4.569h1.479c0.562,0,0.927,0.023,1.098,0.069c0.262,0.068,0.48,0.218,0.657,0.447 s0.265,0.525,0.265,0.89c0,0.28-0.051,0.516-0.152,0.707s-0.231,0.342-0.388,0.45c-0.157,0.109-0.316,0.182-0.479,0.217 c-0.221,0.044-0.539,0.065-0.957,0.065h-0.602v1.724H-271.96z M-271.038,423.472v1.297h0.505c0.363,0,0.606-0.024,0.729-0.072 c0.122-0.048,0.219-0.122,0.288-0.225c0.069-0.102,0.104-0.22,0.104-0.354c0-0.167-0.049-0.304-0.146-0.412 c-0.098-0.107-0.222-0.176-0.371-0.202c-0.109-0.021-0.331-0.031-0.663-0.031H-271.038z"/></g></svg>');
}
}
// Overwrite color for toolbar

5
apps/presentationeditor/sdk_dev_scripts.js
View file

@ -77,6 +77,8 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/cell/model/CellInfo.js",
"../../../../sdkjs/cell/view/DrawingObjectsController.js",
"../../../../sdkjs/slide/Drawing/ThemeLoader.js",
"../../../../sdkjs/word/Editor/DocumentContentElementBase.js",
"../../../../sdkjs/word/Editor/StructuredDocumentTags/BlockLevel.js",
"../../../../sdkjs/word/Editor/Serialize2.js",
"../../../../sdkjs/word/Editor/Numbering.js",
"../../../../sdkjs/word/Editor/NumberingChanges.js",
@ -96,6 +98,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/word/Editor/SectionsChanges.js",
"../../../../sdkjs/word/Editor/Styles.js",
"../../../../sdkjs/word/Editor/StylesChanges.js",
"../../../../sdkjs/word/Editor/RevisionsChange.js",
"../../../../sdkjs/slide/Editor/Format/StylesPrototype.js",
"../../../../sdkjs/word/Drawing/Graphics.js",
"../../../../sdkjs/word/Drawing/ShapeDrawer.js",
@ -108,6 +111,8 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/slide/Editor/Format/SlideMaster.js",
"../../../../sdkjs/slide/Editor/Format/Layout.js",
"../../../../sdkjs/slide/Editor/Format/Comments.js",
"../../../../sdkjs/slide/Editor/Format/NotesMaster.js",
"../../../../sdkjs/slide/Editor/Format/Notes.js",
"../../../../sdkjs/word/Editor/ParagraphContent.js",
"../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js",
"../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js",

1
apps/spreadsheeteditor/embed/index.html
View file

@ -324,7 +324,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>

1
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -316,7 +316,6 @@
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<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-->

4
apps/spreadsheeteditor/main/app.js
View file

@ -55,7 +55,6 @@ require.config({
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
@ -109,8 +108,7 @@ require.config({
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
gateway: {

20
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1047,6 +1047,16 @@ define([
config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
config.closable = true;
break;
case Asc.c_oAscError.ID.FrmlWrongReferences:
config.msg = this.errorFrmlWrongReferences;
config.closable = true;
break;
case Asc.c_oAscError.ID.UnexpectedGuid:
config.msg = this.errorUnexpectedGuid;
break;
@ -1071,10 +1081,6 @@ define([
config.msg = this.errorDataRange;
break;
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
break;
case Asc.c_oAscError.ID.VKeyEncrypt:
config.msg = this.errorToken;
break;
@ -1160,10 +1166,6 @@ define([
config.msg = this.errorOpenWarning;
break;
case Asc.c_oAscError.ID.FrmlWrongReferences:
config.msg = this.errorFrmlWrongReferences;
break;
case Asc.c_oAscError.ID.CopyMultiselectAreaError:
config.msg = this.errorCopyMultiselectArea;
break;
@ -2057,7 +2059,7 @@ define([
errorFileVKey: 'External error.<br>Incorrect securety key. Please, contact support.',
errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.',
errorDataRange: 'Incorrect data range.',
errorOperandExpected: 'Operand expected',
errorOperandExpected: 'The entered function syntax is not correct. Please check if you are missing one of the parentheses - \'(\' or \')\'.',
errorKeyEncrypt: 'Unknown key descriptor',
errorKeyExpire: 'Key descriptor expired',
errorUsersExceed: 'Count of users was exceed',

49
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1436,7 +1436,7 @@ define([
restoreHeight: 300,
style: 'max-height: 300px;',
store: me.getCollection('TableTemplates'),
itemTemplate: _.template('<div class="item-template"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
itemTemplate: _.template('<div class="item-template"><img src="<%= imageUrl %>" id="<%= id %>" style="width:61px;height:46px;"></div>')
});
picker.on('item:click', function(picker, item, record) {
@ -2222,7 +2222,7 @@ define([
store: this.getApplication().getCollection('Common.Collections.TextArt'),
parentMenu: this.toolbar.mnuInsertTextArt.menu,
showLast: false,
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
});
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
@ -2569,8 +2569,23 @@ define([
if (me._state.tablename)
me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname);
else
me.api.asc_addAutoFilter(fmtname, dlg.getSettings());
else {
var settings = dlg.getSettings();
if (settings.selectionType == Asc.c_oAscSelectionType.RangeMax || settings.selectionType == Asc.c_oAscSelectionType.RangeRow ||
settings.selectionType == Asc.c_oAscSelectionType.RangeCol)
Common.UI.warning({
title: me.textLongOperation,
msg: me.warnLongOperation,
buttons: ['ok', 'cancel'],
callback: function(btn) {
if (btn == 'ok')
setTimeout(function() { me.api.asc_addAutoFilter(fmtname, settings.range)}, 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
else
me.api.asc_addAutoFilter(fmtname, settings.range);
}
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@ -2582,14 +2597,30 @@ define([
win.show();
win.setSettings({
api : me.api
api : me.api,
selectionType: me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()
});
} else {
me._state.filter = undefined;
if (me._state.tablename)
me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname);
else
me.api.asc_addAutoFilter(fmtname);
else {
var selectionType = me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType();
if (selectionType == Asc.c_oAscSelectionType.RangeMax || selectionType == Asc.c_oAscSelectionType.RangeRow ||
selectionType == Asc.c_oAscSelectionType.RangeCol)
Common.UI.warning({
title: me.textLongOperation,
msg: me.warnLongOperation,
buttons: ['ok', 'cancel'],
callback: function(btn) {
if (btn == 'ok')
setTimeout(function() { me.api.asc_addAutoFilter(fmtname)}, 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
});
else
me.api.asc_addAutoFilter(fmtname);
}
}
}
},
@ -3022,7 +3053,9 @@ define([
txtExpandSort: 'The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?',
txtExpand: 'Expand and sort',
txtSorting: 'Sorting',
txtSortSelected: 'Sort selected'
txtSortSelected: 'Sort selected',
textLongOperation: 'Long operation',
warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?'
}, SSE.Controllers.Toolbar || {}));
});

6
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -93,7 +93,7 @@ define([
this.handler = options.handler;
this.type = options.type || 'number';
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},
@ -342,7 +342,7 @@ define([
this.api = options.api;
this.handler = options.handler;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},
@ -516,7 +516,7 @@ define([
this.throughIndexes = [];
this.filteredIndexes = [];
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},

4
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file

@ -69,7 +69,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -136,7 +136,7 @@ define([
},
onApiRangeChanged: function(info) {
this.inputRange.setValue(info);
this.inputRange.setValue(info.asc_getName());
if (this.inputRange.cmpEl.hasClass('error'))
this.inputRange.cmpEl.removeClass('error');
},

2
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -925,6 +925,7 @@ define([
{
chartSettings: props,
imageSettings: (me.isChart) ? me._originalProps : null,
sparklineStyles: me.sparklineStyles,
isChart: me.isChart,
api: me.api,
handler: function(result, value) {
@ -1109,6 +1110,7 @@ define([
if (styles && styles.length>1){
var stylesStore = this.cmbSparkStyle.menuPicker.store,
selectedIdx = styles[styles.length-1];
this.sparklineStyles = styles;
if (stylesStore.length == styles.length-1) {
var data = stylesStore.models;
for (var i=0; i<styles.length-1; i++) {

6
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -91,6 +91,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.api = this.options.api;
this.chartSettings = this.options.chartSettings;
this.imageSettings = this.options.imageSettings;
this.sparklineStyles = this.options.sparklineStyles;
this.isChart = this.options.isChart;
this.vertAxisProps = null;
this.horAxisProps = null;
@ -819,7 +820,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
itemHeight: 50,
menuMaxHeight: 272,
enableKeyEvents: true,
cls: 'combo-spark-style'
cls: 'combo-spark-style',
minWidth: 190
});
this.cmbSparkStyle.render($('#spark-dlg-combo-style'));
this.cmbSparkStyle.openButton.menu.cmpEl.css({
@ -1383,7 +1385,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if (record)
this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls'));
this.updateSparkStyles(props.asc_getStyles());
this.updateSparkStyles((this.sparklineStyles) ? this.sparklineStyles : props.asc_getStyles());
if (this._state.SparkType !== Asc.c_oAscSparklineType.Line)
this._arrEmptyCells.pop();

2
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
View file

@ -92,7 +92,7 @@ define([
this.formulasGroups = options.formulasGroups;
this.handler = options.handler;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},

2
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -99,7 +99,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.api = this.options.api;
Common.UI.Window.prototype.initialize.call(this, this.options);

2
apps/spreadsheeteditor/main/app/view/SetValueDialog.js
View file

@ -67,7 +67,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.startvalue = this.options.startvalue;
this.maxvalue = this.options.maxvalue;
this.defaultUnit = this.options.defaultUnit;

12
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1258,6 +1258,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

8
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -68,7 +68,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
@ -489,7 +489,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsersList) {
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
}
},
@ -706,7 +706,7 @@ define([
label: this.labelSheetName,
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
});
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -823,7 +823,7 @@ define([
label: options.ismove ? this.textMoveBefore : this.textCopyBefore,
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
});
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},

12
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file

@ -72,8 +72,9 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable;
this.selectionType = Asc.c_oAscSelectionType.RangeCells;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -129,6 +130,8 @@ define([
}
if (settings.title)
me.setTitle(settings.title);
if (settings.selectionType)
me.selectionType = settings.selectionType;
me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me));
me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me));
@ -145,15 +148,16 @@ define([
if (this.checkRangeType == Asc.c_oAscSelectionDialogType.FormatTable) {
var options = this.api.asc_getAddFormatTableOptions(this.inputRange.getValue());
options.asc_setIsTitle(this.cbTitle.checked);
return options;
return { selectionType: this.selectionType, range: options};
} else
return this.inputRange.getValue();
return { selectionType: this.selectionType, range: this.inputRange.getValue()};
},
onApiRangeChanged: function(info) {
this.inputRange.setValue(info);
this.inputRange.setValue(info.asc_getName());
if (this.inputRange.cmpEl.hasClass('error'))
this.inputRange.cmpEl.removeClass('error');
this.selectionType = info.asc_getType();
},
isRangeValid: function() {

23
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -478,10 +478,25 @@ define([
var handlerDlg = function(dlg, result) {
if (result == 'ok') {
me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
me.api.asc_changeTableRange(me._state.TableName, dlg.getSettings());
var settings = dlg.getSettings();
if (settings.selectionType == Asc.c_oAscSelectionType.RangeMax || settings.selectionType == Asc.c_oAscSelectionType.RangeRow ||
settings.selectionType == Asc.c_oAscSelectionType.RangeCol)
Common.UI.warning({
title: me.textLongOperation,
msg: me.warnLongOperation,
buttons: ['ok', 'cancel'],
callback: function(btn) {
if (btn == 'ok')
setTimeout(function() { me.api.asc_changeTableRange(me._state.TableName, settings.range)}, 1);
Common.NotificationCenter.trigger('edit:complete', me);
}
});
else
me.api.asc_changeTableRange(me._state.TableName, settings.range);
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.NotificationCenter.trigger('edit:complete', me);
};
var win = new SSE.Views.TableOptionsDialog({
handler: handlerDlg
@ -545,7 +560,9 @@ define([
notcriticalErrorTitle : 'Warning',
textReservedName : 'The name you are trying to use is already referenced in cell formulas. Please use some other name.',
textAdvanced: 'Show advanced settings',
textConvertRange: 'Convert to range'
textConvertRange: 'Convert to range',
textLongOperation: 'Long operation',
warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?'
}, SSE.Views.TableSettings || {}));
});

12
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -1228,6 +1228,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
var colors = [],
currentIdx;
_.each (recalc_indexes, function(recalc_index, index) {
colors.push(me.GradColor.colors[recalc_index]);
if (me.GradColor.currentIdx == recalc_index)
currentIdx = index;
});
me.OriginalFillType = null;
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

2
apps/spreadsheeteditor/main/app_dev.js
View file

@ -55,7 +55,6 @@ require.config({
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -122,7 +121,6 @@ require([
'gateway',
'locale',
'jsziputils',
'jsrsasign',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

5
apps/spreadsheeteditor/main/locale/en.json
View file

@ -701,6 +701,8 @@
"SSE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
"SSE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
"SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
"SSE.Controllers.Toolbar.textLongOperation": "Long operation",
"SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
"SSE.Views.AutoFilterDialog.btnCustomFilter": "Custom Filter",
"SSE.Views.AutoFilterDialog.cancelButtonText": "Cancel",
"SSE.Views.AutoFilterDialog.okButtonText": "OK",
@ -1482,6 +1484,9 @@
"SSE.Views.TableSettings.textTableName": "Table Name",
"SSE.Views.TableSettings.textTemplate": "Select From Template",
"SSE.Views.TableSettings.textTotal": "Total",
"SSE.Views.TableSettings.textConvertRange": "Convert to range",
"SSE.Views.TableSettings.textLongOperation": "Long operation",
"SSE.Views.TableSettings.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
"SSE.Views.TableSettingsAdvanced.cancelButtonText": "Cancel",
"SSE.Views.TableSettingsAdvanced.okButtonText": "Ok",
"SSE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",

2
apps/spreadsheeteditor/mobile/app-dev.js
View file

@ -53,7 +53,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
extendes : 'common/mobile/utils/extendes',
@ -102,7 +101,6 @@ require([
'locale',
'jszip',
'jsziputils',
'jsrsasign',
'sockjs'
], function (Backbone, Framework7) {
Backbone.history.start();

4
apps/spreadsheeteditor/mobile/app.js
View file

@ -53,7 +53,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
@ -82,8 +81,7 @@ require.config({
'xregexp',
'sockjs',
'jszip',
'jsziputils',
'jsrsasign'
'jsziputils'
]
},
backbone: {

2
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -786,6 +786,7 @@ define([
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
config.closable = true;
break;
case Asc.c_oAscError.ID.VKeyEncrypt:
@ -875,6 +876,7 @@ define([
case Asc.c_oAscError.ID.FrmlWrongReferences:
config.msg = this.errorFrmlWrongReferences;
config.closable = true;
break;
case Asc.c_oAscError.ID.CopyMultiselectAreaError:

1
apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
View file

@ -87,6 +87,7 @@ define([
_.defer(function () {
var editorLang = SSE.getController("Main").editorConfig.lang;
editorLang = (editorLang ? editorLang : 'en').split("-")[0].toLowerCase();
var localizationFunctions = function(data) {
fc = data;

3
apps/spreadsheeteditor/mobile/app/template/AddOther.template
View file

@ -82,12 +82,13 @@
<div id="addother-imagefromurl">
<div class="page" id="addimage-fromurl" data-page="addimage-url">
<div class="page-content">
<div class="content-block-title"><%= scope.textAddress %></div>
<% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
<div class="list-block">
<ul>
<li>
<div id="addimage-link-url" class="item-content">
<div class="item-inner">
<% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
<div class="item-input">
<input type="url" placeholder="<%= scope.textImageURL %>">
</div>

4
apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
View file

@ -57,7 +57,7 @@ define([
};
_.extend(_params, args);
var $content = $('<div/>').append(_.template(this.template, _params));
var $content = $('<div/>').append(_.template(this.template)(_params));
// Android fix for navigation
if (Framework7.prototype.device.android) {
@ -121,7 +121,7 @@ define([
'Logical': me.sCatLogical
};
me.layout = $('<div/>').append(_.template(me.template, {
me.layout = $('<div/>').append(_.template(me.template)({
android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'),
textGroups : me.textGroups,

4
apps/spreadsheeteditor/mobile/app/view/add/AddLink.js
View file

@ -210,7 +210,7 @@ define([
'<% }) %>';
this.layout.find('#add-link-sheet select').html(
_.template(tpl, {
_.template(tpl)({
worksheets: sheets
})
);
@ -219,7 +219,7 @@ define([
if ($view.length > 0) {
$view.find('#add-link-sheet select').html(
_.template(tpl, {
_.template(tpl)({
worksheets: sheets
})
);

Some files were not shown because too many files have changed in this diff Show more