Merge pull request #1 from ONLYOFFICE/develop

Latest changes from origin

apps/common/main/lib/util/utils.js

@@ -577,7 +577,7 @@ Common.Utils.String = new (function() {
 })();
 
 Common.Utils.isBrowserSupported = function() {
-    return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 9.0) ||
+    return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 10.0) ||
              (Common.Utils.safariVersion != 0 && Common.Utils.safariVersion < 5.0) ||
              (Common.Utils.firefoxVersion != 0 && Common.Utils.firefoxVersion < 4.0) ||
              (Common.Utils.chromeVersion != 0 && Common.Utils.chromeVersion < 7.0) ||

apps/common/main/resources/less/dimension-picker.less

@@ -21,12 +21,12 @@
 
 .dimension-picker-unhighlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
+    .background-ximage('@{common-image-path}/dimension-picker/dimension-unhighlighted.png', '@{common-image-path}/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
 }
 
 .dimension-picker div.dimension-picker-highlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
+    .background-ximage('@{common-image-path}/dimension-picker/dimension-highlighted.png', '@{common-image-path}/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
 }
 
 .dimension-picker-status {

apps/common/main/resources/less/language-dialog.less

@@ -30,7 +30,7 @@
   &.it, &.it-IT                     {background-position: -32px      -24px;}
   &.ko, &.ko-KR                     {background-position: 0          -36px;}
   &.nl, &.nl-NL                     {background-position: -16px      -36px;}
-  &.nb, &.nb-NO                     {background-position: -32px      -36px;}
+  &.nb, &.nb-NO, &.nn, &.nn-NO      {background-position: -32px      -36px;}
   &.pl, &.pl-PL                     {background-position: 0          -48px;}
   &.pt, &.pt-BR                     {background-position: -16px      -48px;}
   &.ro, &.ro-RO                     {background-position: -32px      -48px;}
@@ -42,7 +42,6 @@
   &.lt, &.lt-LT                     {background-position: 0          -84px;}
   &.vi, &.vi-VN                     {background-position: -16px      -84px;}
   &.de-CH                           {background-position: -32px      -84px;}
-  &.nn, &.nn-NO                     {background-position: 0          -96px;}
   &.pt-PT                           {background-position: -16px      -96px;}
   &.de-AT                           {background-position: -32px      -96px;}
   &.es, &.es-ES                     {background-position: 0          -108px;}
@@ -67,4 +66,5 @@
   &.fi, &.fi-FI                     {background-position: -16px      -180px;}
   &.zh, &.zh-CN                     {background-position: -32px      -180px;}
   &.ja, &.ja-JP                     {background-position: 0          -192px;}
+  &.es-MX                           {background-position: -16px      -192px;}
 }

apps/documenteditor/embed/index.html

@@ -198,7 +198,7 @@
                 check = function(regex){ return regex.test(userAgent); };
            if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
                 var m = /msie (\d+\.\d+)/.exec(userAgent);
-                if (m && parseFloat(m[1]) < 9.0) {
+                if (m && parseFloat(m[1]) < 10.0) {
                     document.write(
                         '<div id="id-error-mask" class="errormask">',
                             '<div class="error-body" align="center">',
@@ -340,7 +340,7 @@
       <script type="text/javascript" src="js/application.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/documenteditor/embed/index.html.deploy

@@ -190,7 +190,7 @@
                 check = function(regex){ return regex.test(userAgent); };
             if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
                 var m = /msie (\d+\.\d+)/.exec(userAgent);
-                if (m && parseFloat(m[1]) < 9.0) {
+                if (m && parseFloat(m[1]) < 10.0) {
                     document.write(
                         '<div id="id-error-mask" class="errormask">',
                             '<div class="error-body" align="center">',
@@ -321,7 +321,7 @@
       <script type="text/javascript" src="../../../apps/documenteditor/embed/app-all.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/documenteditor/main/app/controller/Main.js

@@ -900,6 +900,8 @@ define([
                 leftmenuController.getView('LeftMenu').getMenu('file').loadDocument({doc:me.document});
                 leftmenuController.setMode(me.appOptions).createDelayedElements().setApi(me.api);
 
+                navigationController.setApi(me.api);
+
                 chatController.setApi(this.api).setMode(this.appOptions);
                 application.getController('Common.Controllers.ExternalDiagramEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
                 application.getController('Common.Controllers.ExternalMergeEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
@@ -909,8 +911,6 @@ define([
                 me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
                 me.api.asc_registerCallback('asc_onPluginsReset', _.bind(me.resetPluginsList, me));
 
-                navigationController.setApi(me.api);
-
                 documentHolderController.setApi(me.api);
                 documentHolderController.createDelayedElements();
                 statusbarController.createDelayedElements();
@@ -1081,7 +1081,7 @@ define([
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
                 this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
                 this.appOptions.trialMode      = params.asc_getLicenseMode();
-                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.api.asc_isSignaturesSupport();
+                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
 
                 if ( this.appOptions.isLightVersion ) {
                     this.appOptions.canUseHistory =
@@ -2091,10 +2091,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {

apps/documenteditor/main/app/controller/Navigation.js

@@ -62,7 +62,7 @@ define([
                         me.updateNavigation();
                     },
                     'hide': function() {
-                        me.api.asc_HideDocumentOutline();
+                        me.api && me.api.asc_HideDocumentOutline();
                     }
                 }
             });

apps/documenteditor/main/app/template/Toolbar.template

@@ -108,7 +108,6 @@
                 <div class="group">
                     <span class="btn-slot text x-huge btn-pagebreak"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
-                    <span class="btn-slot text x-huge btn-contents"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
@@ -123,7 +122,6 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge slot-inshyperlink"></span>
-                    <span class="btn-slot text x-huge slot-notes"></span>
                     <span class="btn-slot text x-huge slot-comment"></span>
                 </div>
                 <div class="separator long"></div>

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -1865,10 +1865,10 @@ define([
         },
 
         onControlsSelect: function(item, e) {
+            var me = this;
             var props = this.api.asc_GetContentControlProperties();
             if (props) {
                 if (item.value == 'settings') {
-                    var me = this;
                     (new DE.Views.ControlSettingsDialog({
                         props: props,
                         handler: function (result, value) {

apps/documenteditor/main/app/view/TableOfContentsSettings.js

@@ -159,7 +159,7 @@ define([
                         properties.put_RightAlignTab(this.chAlign.getValue() == 'checked');
                         properties.put_TabLeader(this.cmbLeader.getValue());
                     }
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -177,7 +177,7 @@ define([
                     if (checked) {
                         properties.put_TabLeader(this.cmbLeader.getValue());
                     }
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -199,7 +199,7 @@ define([
                 if (this.api && !this._noApply) {
                     var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr();
                     properties.put_TabLeader(record.value);
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -212,7 +212,7 @@ define([
                 if (this.api && !this._noApply) {
                     var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr();
                     properties.put_Hyperlink(field.getValue()=='checked');
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -269,7 +269,7 @@ define([
                 if (this.api && !this._noApply) {
                     var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr();
                     properties.put_StylesType(record.value);
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -293,7 +293,7 @@ define([
                     var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr();
                     properties.clear_Styles();
                     properties.put_OutlineRange(this.startLevel, this.endLevel);
-                    // this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
+                    this.api.SetDrawImagePlaceContents('tableofcontents-img', properties);
                 }
             }, this));
 
@@ -333,6 +333,11 @@ define([
             Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments);
         },
 
+        close: function() {
+            this.api.SetDrawImagePlaceContents(null);
+            Common.Views.AdvancedSettingsWindow.prototype.close.apply(this);
+        },
+
         _setDefaults: function (props) {
             this._noApply = true;
 
@@ -459,7 +464,7 @@ define([
                 }
             }
 
-            // this.api.SetDrawImagePlaceContents('tableofcontents-img', this._originalProps);
+            this.api.SetDrawImagePlaceContents('tableofcontents-img', this._originalProps);
 
             this._noApply = false;
         },

apps/documenteditor/main/app/view/Toolbar.js

@@ -2434,7 +2434,7 @@ define([
             textSurface: 'Surface',
             textTabCollaboration: 'Collaboration',
             textTabProtect: 'Protection',
-            textTabLinks: 'Links',
+            textTabLinks: 'References',
             capBtnInsControls: 'Content Control',
             textRichControl: 'Rich text',
             textPlainControl: 'Plain text',

apps/documenteditor/main/index.html

@@ -182,7 +182,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write(
                     '<div class="app-error-panel">' +
                         '<div class="message-block">' +

apps/documenteditor/main/index.html.deploy

@@ -183,7 +183,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write('<div class="app-error-panel">' +
                                 '<div class="message-block">' +
                                     '<div class="message-inner">' +

apps/documenteditor/main/locale/en.json

@@ -1783,6 +1783,7 @@
   "DE.Views.Toolbar.textTabLayout": "Layout",
   "DE.Views.Toolbar.textTabLinks": "References",
   "DE.Views.Toolbar.textTabProtect": "Protection",
+  "DE.Views.Toolbar.textTabLinks": "References",
   "DE.Views.Toolbar.textTabReview": "Review",
   "DE.Views.Toolbar.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "To current position",

apps/documenteditor/main/resources/less/advanced-settings.less

@@ -67,7 +67,7 @@
 }
 
 .img-arrows {
-    .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
+    .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
 }
 
 .item-arrow {

apps/documenteditor/main/resources/less/rightmenu.less

@@ -173,7 +173,7 @@
 }
 
 .btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small {
-   .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px);
+   .background-ximage('@{common-image-path}/right-panels/SmallBorders.png', '@{common-image-path}/right-panels/SmallBorders@2x.png', 84px);
 }
 
 .button-normal-icon(btn-position-all,         0, 21px);
@@ -191,7 +191,7 @@
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px);
+    .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
 }
@@ -209,7 +209,7 @@ button.active:not(.disabled) .btn-change-shape,
 button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -16px;}
 
 .combo-pattern-item {
-    .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px);
+    .background-ximage('@{common-image-path}/right-panels/patterns.png', '@{common-image-path}/right-panels/patterns@2x.png', 112px);
 }
 
 .combo-dataview-menu {
@@ -225,7 +225,7 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 }
 
 .item-gradient {
-    .background-ximage('@{app-image-path}/right-panels/gradients.png', '@{app-image-path}/right-panels/gradients@2x.png', 150px);
+    .background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px);
     width:50px;
     height:50px;
 }

apps/documenteditor/main/resources/less/toolbar.less

@@ -49,7 +49,7 @@
 }
 
 .item-markerlist {
-    .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
+    .background-ximage('@{common-image-path}/toolbar/bullets-and-numbering.png', '@{common-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
     width: 38px;
     height: 38px;
 }
@@ -163,7 +163,7 @@ a.item-contents {
 }
 
 .item-chartlist {
-    .background-ximage('@{app-image-path}/toolbar/charttypes.png', '@{app-image-path}/toolbar/charttypes@2x.png', 250px);
+    .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
     width: 50px;
     height: 50px;
 }
@@ -418,7 +418,7 @@ a.item-contents {
 
 .item-equation {
     border: 1px solid @gray;
-    .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px);
+    .background-ximage('@{common-image-path}/toolbar/math.png', '@{common-image-path}/toolbar/math@2x.png', 1500px);
 }
 
 .save-style-container {

apps/presentationeditor/embed/index.html

@@ -197,7 +197,7 @@
                check = function(regex){ return regex.test(userAgent); };
           if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
                var m = /msie (\d+\.\d+)/.exec(userAgent);
-               if (m && parseFloat(m[1]) < 9.0) {
+               if (m && parseFloat(m[1]) < 10.0) {
                    document.write(
                        '<div id="id-error-mask" class="errormask">',
                            '<div class="error-body" align="center">',
@@ -342,7 +342,7 @@
       <script type="text/javascript" src="js/application.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/presentationeditor/embed/index.html.deploy

@@ -190,7 +190,7 @@
               check = function(regex){ return regex.test(userAgent); };
          if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
               var m = /msie (\d+\.\d+)/.exec(userAgent);
-              if (m && parseFloat(m[1]) < 9.0) {
+              if (m && parseFloat(m[1]) < 10.0) {
                   document.write(
                       '<div id="id-error-mask" class="errormask">',
                           '<div class="error-body" align="center">',
@@ -325,7 +325,7 @@
       <script type="text/javascript" src="../../../apps/presentationeditor/embed/app-all.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/presentationeditor/embed/index.html.opensource

@@ -215,7 +215,7 @@
       <script type="text/javascript" src="js/application.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/presentationeditor/main/app/controller/Main.js

@@ -840,7 +840,7 @@ define([
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
                 this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
                 this.appOptions.trialMode      = params.asc_getLicenseMode();
-                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.api.asc_isSignaturesSupport();
+                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
 
                 this.appOptions.canBranding  = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
                 if (this.appOptions.canBranding)
@@ -1842,10 +1842,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {

apps/presentationeditor/main/index.html

@@ -181,7 +181,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write(
                     '<div class="app-error-panel">' +
                         '<div class="message-block">' +

apps/presentationeditor/main/index.html.deploy

@@ -183,7 +183,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write('<div class="app-error-panel">' +
                                 '<div class="message-block">' +
                                     '<div class="message-inner">' +

apps/presentationeditor/main/index.reporter.html

@@ -187,7 +187,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write('<div class="app-error-panel">' +
                                 '<div class="message-block">' +
                                     '<div class="message-inner">' +

apps/presentationeditor/main/index.reporter.html.deploy

@@ -183,7 +183,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write('<div class="app-error-panel">' +
                                 '<div class="message-block">' +
                                     '<div class="message-inner">' +

apps/presentationeditor/main/resources/less/advanced-settings.less

@@ -6,7 +6,7 @@
         background-color: white;
 
         &.image {
-            .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
+            .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
             background-repeat: no-repeat;
             background-position: 10px 0;
             background-attachment: scroll;
@@ -25,7 +25,7 @@
 }
 
 .item-arrow {
-    .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
+    .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
     width:44px;
     height:20px;
 }

apps/presentationeditor/main/resources/less/rightmenu.less

@@ -109,7 +109,7 @@
 }
 
 .btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small {
-   .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px);
+   .background-ximage('@{common-image-path}/right-panels/SmallBorders.png', '@{common-image-path}/right-panels/SmallBorders@2x.png', 84px);
 }
 
 .button-normal-icon(btn-position-all,         0, 21px);
@@ -127,7 +127,7 @@
 
 .btn-edit-table,
 .btn-change-shape {
-    .background-ximage('@{app-image-path}/right-panels/rowscols_icon.png', '@{app-image-path}/right-panels/rowscols_icon@2x.png', 84px);
+    .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);
     margin-right: 2px !important;
     margin-bottom: 1px !important;
 }
@@ -145,7 +145,7 @@ button.active:not(.disabled) .btn-change-shape,
 button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -16px;}
 
 .combo-pattern-item {
-    .background-ximage('@{app-image-path}/right-panels/patterns.png', '@{app-image-path}/right-panels/patterns@2x.png', 112px);
+    .background-ximage('@{common-image-path}/right-panels/patterns.png', '@{common-image-path}/right-panels/patterns@2x.png', 112px);
 }
 
 .combo-dataview-menu {
@@ -161,7 +161,7 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 }
 
 .item-gradient {
-    .background-ximage('@{app-image-path}/right-panels/gradients.png', '@{app-image-path}/right-panels/gradients@2x.png', 150px);
+    .background-ximage('@{common-image-path}/right-panels/gradients.png', '@{common-image-path}/right-panels/gradients@2x.png', 150px);
     width:50px;
     height:50px;
 }

apps/presentationeditor/main/resources/less/toolbar.less

@@ -61,7 +61,7 @@
 }
 
 .item-markerlist {
-    .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
+    .background-ximage('@{common-image-path}/toolbar/bullets-and-numbering.png', '@{common-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
     width: 38px;
     height: 38px;
 }
@@ -119,7 +119,7 @@
 }
 
 .item-chartlist {
-    .background-ximage('@{app-image-path}/toolbar/charttypes.png', '@{app-image-path}/toolbar/charttypes@2x.png', 250px);
+    .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
     width: 50px;
     height: 50px;
 }
@@ -345,7 +345,7 @@
 
 .item-equation {
     border: 1px solid @gray;
-    .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px);
+    .background-ximage('@{common-image-path}/toolbar/math.png', '@{common-image-path}/toolbar/math@2x.png', 1500px);
 }
 
 #plugins-panel {

apps/presentationeditor/main/resources/less/variables.less

@@ -1,9 +1,6 @@
 // Paths
 // -------------------------
 
-@app-image-path:        "resources/img";
-@common-image-path:     "../../common/main/resources/img";
-
 // Grays
 // -------------------------
 

apps/spreadsheeteditor/embed/index.html

@@ -198,7 +198,7 @@
                check = function(regex){ return regex.test(userAgent); };
           if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
                var m = /msie (\d+\.\d+)/.exec(userAgent);
-               if (m && parseFloat(m[1]) < 9.0) {
+               if (m && parseFloat(m[1]) < 10.0) {
                    document.write(
                        '<div id="id-error-mask" class="errormask">',
                            '<div class="error-body" align="center">',
@@ -343,7 +343,7 @@
       <script type="text/javascript" src="js/application.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/spreadsheeteditor/embed/index.html.deploy

@@ -190,7 +190,7 @@
             check = function(regex){ return regex.test(userAgent); };
        if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write(
                     '<div id="id-error-mask" class="errormask">',
                         '<div class="error-body" align="center">',
@@ -326,7 +326,7 @@
       <script type="text/javascript" src="../../../apps/spreadsheeteditor/embed/app-all.js"></script>
       <script type="text/javascript">
           var isBrowserSupported = function() {
-              return  ($.browser.msie     && parseFloat($.browser.version) > 8)     ||
+              return  ($.browser.msie     && parseFloat($.browser.version) > 9)     ||
                       ($.browser.chrome   && parseFloat($.browser.version) > 7)     ||
                       ($.browser.safari   && parseFloat($.browser.version) > 4)     ||
                       ($.browser.opera    && parseFloat($.browser.version) > 10.4)  ||

apps/spreadsheeteditor/main/app/controller/DocumentHolder.js

@@ -1479,11 +1479,12 @@ define([
                 });
                 documentHolder.pmiCopy.setDisabled(false);
                 documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked);
-                documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked);
+                documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked || inPivot);
                 documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked);
                 documentHolder.pmiDeleteEntire.setDisabled(isCellLocked || isTableLocked);
-                documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked);
+                documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked || inPivot);
                 documentHolder.pmiDeleteTable.setDisabled(isCellLocked || isTableLocked);
+                documentHolder.pmiClear.setDisabled(isCellLocked || inPivot);
                 documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null) || inPivot || !filterInfo && !this.permissions.canModifyFilter);
                 documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null) || inPivot || !this.permissions.canModifyFilter);
                 documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true));

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -860,7 +860,7 @@ define([
                     this.appOptions.canChat        = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
                     this.appOptions.canRename      = !!this.permissions.rename;
                     this.appOptions.trialMode      = params.asc_getLicenseMode();
-                    this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.api.asc_isSignaturesSupport();
+                    this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
                     this.appOptions.canModifyFilter = (this.permissions.modifyFilter!==false);
                     this.appOptions.canBranding  = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
                     if (this.appOptions.canBranding)
@@ -2033,10 +2033,10 @@ define([
                 } else if (!uiCustomize){
                     this.appOptions.canPlugins = false;
                 }
+                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
                 if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions).runAutoStartPlugins(plugins.autostart);
                 }
-                if (!uiCustomize) this.getApplication().getController('LeftMenu').enablePlugins();
             },
 
             resetPluginsList: function() {

apps/spreadsheeteditor/main/app/controller/RightMenu.js

@@ -118,7 +118,7 @@ define([
                 selectType = info.asc_getFlags().asc_getSelectionType(),
                 formatTableInfo = info.asc_getFormatTableInfo(),
                 sparkLineInfo = info.asc_getSparklineInfo(),
-                pivotInfo = info.asc_getPivotTableInfo();
+                pivotInfo = null;//info.asc_getPivotTableInfo();
 
             if (selectType == Asc.c_oAscSelectionType.RangeImage || selectType == Asc.c_oAscSelectionType.RangeShape ||
                 selectType == Asc.c_oAscSelectionType.RangeChart || selectType == Asc.c_oAscSelectionType.RangeChartText || selectType == Asc.c_oAscSelectionType.RangeShapeText) {

apps/spreadsheeteditor/main/app/controller/Toolbar.js

@@ -1477,7 +1477,7 @@ define([
                         e.stopPropagation();
                     },
                     'command+k,ctrl+k': function (e) {
-                        if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect)
+                        if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect && !me._state.inpivot)
                             me.onHyperlink();
                         e.preventDefault();
                     },
@@ -2158,8 +2158,8 @@ define([
                 this._state.multiselect = info.asc_getFlags().asc_getMultiselect();
                 toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]});
 
-                need_disable = !!info.asc_getPivotTableInfo();
-                toolbar.lockToolbar(SSE.enumLock.editPivot, need_disable, { array: [toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnSetAutofilter, toolbar.btnClearAutofilter, toolbar.btnSortDown, toolbar.btnSortUp, toolbar.btnAutofilter]});
+                this._state.inpivot = !!info.asc_getPivotTableInfo();
+                toolbar.lockToolbar(SSE.enumLock.editPivot, this._state.inpivot, { array: [toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnSetAutofilter, toolbar.btnClearAutofilter, toolbar.btnSortDown, toolbar.btnSortUp, toolbar.btnAutofilter]});
 
                 need_disable = !this.appConfig.canModifyFilter;
                 toolbar.lockToolbar(SSE.enumLock.cantModifyFilter, need_disable, { array: [toolbar.btnSortDown, toolbar.btnSortUp, toolbar.mnuitemSortAZ, toolbar.mnuitemSortZA, toolbar.btnSetAutofilter,

apps/spreadsheeteditor/main/app/view/FileMenuPanels.js

@@ -609,9 +609,9 @@ define([
                 this.updateFuncExample(record.exampleValue);
             }, this));
 
-            var regdata = [{ value: 0x042C }, { value: 0x0405 }, { value: 0x0407 }, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A },
-                            { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0415 }, { value: 0x0416 },
-                            { value: 0x0816 }, { value: 0x0419 }, { value: 0x0424 }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+            var regdata = [{ value: 0x042C }, { value: 0x0405 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
+                            { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                            { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
             regdata.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
                 item.displayValue = langinfo[1];

apps/spreadsheeteditor/main/index.html

@@ -180,7 +180,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write(
                     '<div class="app-error-panel">' +
                         '<div class="message-block">' +

apps/spreadsheeteditor/main/index.html.deploy

@@ -182,7 +182,7 @@
             stopLoading = false;
         if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
             var m = /msie (\d+\.\d+)/.exec(userAgent);
-            if (m && parseFloat(m[1]) < 9.0) {
+            if (m && parseFloat(m[1]) < 10.0) {
                 document.write('<div class="app-error-panel">' +
                                 '<div class="message-block">' +
                                     '<div class="message-inner">' +

apps/spreadsheeteditor/main/resources/less/advanced-settings.less

@@ -6,7 +6,7 @@
         background-color: white;
 
         &.image {
-            .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
+            .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
             background-repeat: no-repeat;
             background-position: 10px 0;
             background-attachment: scroll;
@@ -25,7 +25,7 @@
 }
 
 .item-arrow {
-    .background-ximage('@{app-image-path}/right-panels/Begin-EndStyle.png', '@{app-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
+    .background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
     width:44px;
     height:20px;
 }