+
+
+ -
+
- + + +
- + + +
- + + +
',
+ '
',
'
',
+ '
',
- '',
+ '',
'
'
@@ -526,13 +591,19 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
- suppressScrollX: true
+ suppressScrollX: true,
+ alwaysVisibleY: true
});
}
return this;
},
+ show: function() {
+ Common.UI.BaseView.prototype.show.call(this,arguments);
+ this.scroller && this.scroller.update();
+ },
+
onRecentFileClick: function(view, itemview, record){
if ( this.menu )
this.menu.fireEvent('recent:open', [this.menu, record.get('url')]);
@@ -595,13 +666,19 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
- suppressScrollX: true
+ suppressScrollX: true,
+ alwaysVisibleY: true
});
}
return this;
},
+ show: function() {
+ Common.UI.BaseView.prototype.show.call(this,arguments);
+ this.scroller && this.scroller.update();
+ },
+
_onBlankDocument: function() {
if ( this.menu )
this.menu.fireEvent('create:new', [this.menu, 'blank']);
@@ -802,7 +879,8 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
- suppressScrollX: true
+ suppressScrollX: true,
+ alwaysVisibleY: true
});
}
@@ -813,6 +891,7 @@ define([
Common.UI.BaseView.prototype.show.call(this,arguments);
this.updateFileInfo();
+ this.scroller && this.scroller.update();
},
hide: function() {
@@ -1045,7 +1124,8 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
- suppressScrollX: true
+ suppressScrollX: true,
+ alwaysVisibleY: true
});
}
@@ -1057,6 +1137,7 @@ define([
show: function() {
Common.UI.BaseView.prototype.show.call(this,arguments);
+ this.scroller && this.scroller.update();
},
hide: function() {
@@ -1334,7 +1415,8 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
- suppressScrollX: true
+ suppressScrollX: true,
+ alwaysVisibleY: true
});
}
@@ -1348,6 +1430,7 @@ define([
Common.UI.BaseView.prototype.show.call(this,arguments);
this.updateSignatures();
this.updateEncrypt();
+ this.scroller && this.scroller.update();
},
setMode: function(mode) {
diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
index d7a669ac1..ec2a29bff 100644
--- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
+++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
@@ -65,7 +65,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
template,
'',
'',
- '',
+ '',
'',
'',
- '',
+ '',
'',
'',
'',
- ''
+ ''
].join('');
this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/presentationeditor/main/app/view/SlideshowSettings.js b/apps/presentationeditor/main/app/view/SlideshowSettings.js
index c4e595dba..a9abd396a 100644
--- a/apps/presentationeditor/main/app/view/SlideshowSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideshowSettings.js
@@ -62,7 +62,7 @@ define([
'<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
',
'<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
',
'',
'',
'
',
- ''
+ ''
].join('');
this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index ff1228ea7..4537f48c0 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -836,12 +836,12 @@ define([
me.listTheme.fieldPicker.itemTemplate = _.template([
'',
- '
' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>',
+ '
'
].join(''));
me.listTheme.menuPicker.itemTemplate = _.template([
'' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;">
',
'',
- '
+ 
diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html
index d789d5680..ea20a977b 100644
--- a/apps/presentationeditor/main/index_loader.html
+++ b/apps/presentationeditor/main/index_loader.html
@@ -259,6 +259,7 @@
+
' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>',
+ '
'
].join(''));
@@ -1505,7 +1505,7 @@ define([
store: PE.getCollection('SlideLayouts'),
itemTemplate: _.template([
'' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;">
',
'',
- '',
+ '',
'
'
].join(''))
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 6b431247e..ba53817f6 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -295,6 +295,7 @@
<%= title %>
',
'
+
diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html
index d789d5680..ea20a977b 100644
--- a/apps/presentationeditor/main/index_loader.html
+++ b/apps/presentationeditor/main/index_loader.html
@@ -259,6 +259,7 @@
+
' + comment.username + '
' + - '' + comment.date + '
'; + template += '' + me.sliceQuote(comment.quote) + '
'; - template += ''; _.each(comment.replys, function (reply) { @@ -202,8 +202,8 @@ define([ if (isAndroid) { template += '' + reply.userInitials + ' '
}
- template += '' + reply.username + ' ' +
+ '' +
' ';
if (isAndroid) {
template += '';
@@ -212,7 +212,7 @@ define([
template += '';
}
template += '' +
- '' +
+ '' +
'';
});
template += '
' @@ -249,8 +249,8 @@ define([ '' + reply.username + '
' + - '' + + template += '<%= item.username %>
', - '<%= item.date %>
', + '<%= quote %>
', + '<%= item.comment %>
', + '', '<% _.each(item.replys, function (reply) { %>', @@ -271,15 +271,15 @@ define([ '',
'<% } %>',
'<% if (reply.editable && !viewmode) { %>',
'',
'<% } %>',
' ',
- '',
+ '',
'',
'<% }); %>',
'
', diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less index 919c94f6a..d958e12f4 100644 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ b/apps/common/mobile/resources/less/ios/_collaboration.less @@ -145,10 +145,7 @@ padding: 16px 0; word-wrap: break-word; } - p { - margin: 0; - word-break: break-word; - } + .list-reply { padding-left: 26px; } @@ -176,6 +173,9 @@ margin: 0; max-width: 100%; padding-right: 15px; + pre { + white-space: pre-wrap; + } } .reply-item { margin-top: 15px; diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less index a7439c97f..58fe43f98 100644 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ b/apps/common/mobile/resources/less/material/_collaboration.less @@ -143,10 +143,6 @@ } } } - p { - margin: 0; - word-break: break-word; - } .list-reply { padding-left: 26px; } @@ -173,6 +169,9 @@ margin: 0; max-width: 100%; padding-right: 15px; + pre { + white-space: pre-wrap; + } } .reply-item { padding-right: 16px; @@ -203,7 +202,7 @@ outline:none; width: 100%; font-size: 15px; - border: 1px solid #c4c4c4; + border: none; border-radius: 3px; min-height: 100px; } diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index dffc44187..8eef26616 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -99,6 +99,12 @@ DE.ApplicationController = new(function(){ docInfo.put_VKey(docConfig.vkey); docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(config.encryptionKeys); + + var enable = !config.customization || (config.customization.macros!==false); + docInfo.asc_putIsEnabledMacroses(!!enable); + enable = !config.customization || (config.customization.plugins!==false); + docInfo.asc_putIsEnabledPlugins(!!enable); var type = /^(?:(pdf|djvu|xps))$/.exec(docConfig.fileType); if (type && typeof type[1] === 'string') { @@ -107,6 +113,7 @@ DE.ApplicationController = new(function(){ if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); + api.asc_registerCallback('asc_onRunAutostartMacroses', onRunAutostartMacroses); api.asc_setDocInfo(docInfo); api.asc_getEditorPermissions(config.licenseUrl, config.customerId); api.asc_enableKeyEvents(true); @@ -481,6 +488,11 @@ DE.ApplicationController = new(function(){ if (api) api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true)); } + function onRunAutostartMacroses() { + if (!config.customization || (config.customization.macros!==false)) + if (api) api.asc_runAutostartMacroses(); + } + // Helpers // ------------------------- diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index e0d5c80d9..ef762b511 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -490,6 +490,10 @@ define([ value = Common.localStorage.getBool("de-settings-spellcheck", true); Common.Utils.InternalSettings.set("de-settings-spellcheck", value); this.api.asc_setSpellCheck(value); + + value = parseInt(Common.localStorage.getItem("de-settings-paste-button")); + Common.Utils.InternalSettings.set("de-settings-paste-button", value); + this.api.asc_setVisiblePasteButton(!!value); } this.api.put_ShowSnapLines(Common.Utils.InternalSettings.get("de-settings-showsnaplines")); @@ -499,8 +503,12 @@ define([ onCreateNew: function(menu, type) { if ( !Common.Controllers.Desktop.process('create:new') ) { - var newDocumentPage = window.open(type == 'blank' ? this.mode.createUrl : type, "_blank"); - if (newDocumentPage) newDocumentPage.focus(); + if (this.mode.canRequestCreateNew) + Common.Gateway.requestCreateNew(); + else { + var newDocumentPage = window.open(type == 'blank' ? this.mode.createUrl : type, "_blank"); + if (newDocumentPage) newDocumentPage.focus(); + } } if (menu) { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 4a093b4c0..f963fe96d 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -337,11 +337,12 @@ define([ this.editorConfig.user = this.appOptions.user = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous); this.appOptions.isDesktopApp = this.editorConfig.targetApp == 'desktop'; - this.appOptions.canCreateNew = !_.isEmpty(this.editorConfig.createUrl); + this.appOptions.canCreateNew = this.editorConfig.canRequestCreateNew || !_.isEmpty(this.editorConfig.createUrl); this.appOptions.canOpenRecent = this.editorConfig.recent !== undefined && !this.appOptions.isDesktopApp; this.appOptions.templates = this.editorConfig.templates; this.appOptions.recent = this.editorConfig.recent; this.appOptions.createUrl = this.editorConfig.createUrl; + this.appOptions.canRequestCreateNew = this.editorConfig.canRequestCreateNew; this.appOptions.lang = this.editorConfig.lang; this.appOptions.location = (typeof (this.editorConfig.location) == 'string') ? this.editorConfig.location.toLowerCase() : ''; this.appOptions.sharingSettingsUrl = this.editorConfig.sharingSettingsUrl; @@ -384,6 +385,14 @@ define([ $('#editor-container').append('' + this.criticalErrorExtText; + config.msg += '
' + this.criticalErrorExtText; config.callback = function(btn) { if (btn == 'ok') Common.NotificationCenter.trigger('goback', true); @@ -2236,6 +2256,36 @@ define([ Common.Utils.warningDocumentIsLocked({disablefunc: _disable_ui}); }, + onRunAutostartMacroses: function() { + var me = this, + enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); + if (enable) { + var value = Common.Utils.InternalSettings.get("de-macros-mode"); + if (value==1) + this.api.asc_runAutostartMacroses(); + else if (value === 0) { + Common.UI.warning({ + msg: this.textHasMacros + '
', + buttons: ['yes', 'no'], + primary: 'yes', + dontshow: true, + textDontShow: this.textRemember, + callback: function(btn, dontshow){ + if (dontshow) { + Common.Utils.InternalSettings.set("de-macros-mode", (btn == 'yes') ? 1 : 2); + Common.localStorage.setItem("de-macros-mode", (btn == 'yes') ? 1 : 2); + } + if (btn == 'yes') { + setTimeout(function() { + me.api.asc_runAutostartMacroses(); + }, 1); + } + } + }); + } + } + }, + leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', criticalErrorTitle: 'Error', notcriticalErrorTitle: 'Warning', @@ -2587,7 +2637,9 @@ define([ textApplyAll: 'Apply to all equations', textLearnMore: 'Learn More', txtEnterDate: 'Enter a date.', - txtTypeEquation: 'Type equation here.' + txtTypeEquation: 'Type equation here.', + textHasMacros: 'The file contains automatic macros.
Do you want to run macros?', + textRemember: 'Remember my choice' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/template/FileMenu.template b/apps/documenteditor/main/app/template/FileMenu.template index 35378e635..8bb022a44 100644 --- a/apps/documenteditor/main/app/template/FileMenu.template +++ b/apps/documenteditor/main/app/template/FileMenu.template @@ -1,37 +1,37 @@