Merge branch 'feature/new-toolbar'

apps/common/main/lib/component/Menu.js

@@ -454,6 +454,7 @@ define([
                         Common.UI.Menu.Manager.hideAll();
                     if ( $(e.currentTarget).closest('li').hasClass('dropdown-submenu')) {
                         e.stopPropagation();
+                        return false;
                     }
                 } else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN)  {
                     this.fromKeyDown = true;

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

@@ -593,7 +593,7 @@ define([
                     this.setLongActionView(action)
                 } else {
                     var me = this;
-                    if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
+                    if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
                         if (this._state.fastCoauth && this._state.usersCount>1) {
                             me._state.timerSave = setTimeout(function () {
                                 me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000);
@@ -631,8 +631,8 @@ define([
                     case Asc.c_oAscAsyncAction['ForceSaveButton']:
                         clearTimeout(this._state.timerSave);
                         force = true;
-                        title   = this.saveTitleText;
-                        text    = this.saveTextText;
+                        title   = (!this.appOptions.isOffline) ? this.saveTitleText : '';
+                        text    = (!this.appOptions.isOffline) ? this.saveTextText : '';
                         break;
 
                     case Asc.c_oAscAsyncAction['LoadDocumentFonts']:

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

@@ -229,19 +229,19 @@
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 @toolbar-icon-size: 20px;

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

@@ -541,6 +541,8 @@ define([
                     me.api.zoomFitToWidth();
                 }
 
+                DE.getController('Toolbar').activateControls();
+
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("de-license-warning");
                     value = (value!==null) ? parseInt(value) : 0;

apps/documenteditor/mobile/app/controller/Toolbar.js

@@ -157,6 +157,10 @@ define([
                 }
             },
 
+            activateControls: function() {
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',

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

@@ -92,6 +92,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 return me;
             },

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

@@ -413,7 +413,7 @@ define([
                 if (action) {
                     this.setLongActionView(action)
                 } else {
-                    if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
+                    if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
                         if (this._state.fastCoauth && this._state.usersCount>1) {
                             var me = this;
                             me._state.timerSave = setTimeout(function () {
@@ -451,8 +451,8 @@ define([
                     case Asc.c_oAscAsyncAction['ForceSaveButton']:
                         clearTimeout(this._state.timerSave);
                         force = true;
-                        // title   = this.saveTitleText;
-                        // text    = this.saveTextText;
+                        // title   = (!this.appOptions.isOffline) ? this.saveTitleText : '';
+                        // text    = (!this.appOptions.isOffline) ? this.saveTextText : '';
                         break;
 
                     case Asc.c_oAscAsyncAction['ForceSaveTimeout']:

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

@@ -223,19 +223,19 @@
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 @toolbar-icon-size: 20px;

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

@@ -508,6 +508,8 @@ define([
                     me.api.zoomFitToPage();
                 }
 
+                PE.getController('Toolbar').activateControls();
+
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("de-license-warning");
                     value = (value!==null) ? parseInt(value) : 0;

apps/presentationeditor/mobile/app/controller/Toolbar.js

@@ -168,6 +168,10 @@ define([
                 }
             },
 
+            activateControls: function() {
+                $('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',

apps/presentationeditor/mobile/app/view/Toolbar.js

@@ -93,6 +93,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-preview, #toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 return me;
             },

apps/spreadsheeteditor/main/resources/less/rightmenu.less

@@ -314,19 +314,19 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
 }
 
 .surface-normal{
-    background-position: -100px -200px;
+    background-position: 0px -300px;
 }
 
 .surface-wireframe{
-    background-position: -100px -200px;
+    background-position: -50px -300px;
 }
 
 .contour-normal{
-    background-position: -100px -200px;
+    background-position: -100px -300px;
 }
 
 .contour-wireframe{
-    background-position: -100px -200px;
+    background-position: -150px -300px;
 }
 
 #table-combo-template .combo-dataview{

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

@@ -527,6 +527,7 @@ define([
                     mode: me.appOptions.isEdit ? 'edit' : 'view'
                 });
 
+                SSE.getController('Toolbar').activateControls();
 
                 if (me._state.licenseWarning) {
                     value = Common.localStorage.getItem("sse-license-warning");

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

@@ -191,6 +191,10 @@ define([
                 this.getView('Toolbar').disableControl(['add', 'edit'], islocked);
             },
 
+            activateControls: function() {
+                $('#toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+            },
+
             dlgLeaveTitleText   : 'You leave the application',
             dlgLeaveMsgText     : 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
             leaveButtonText     : 'Leave this Page',

apps/spreadsheeteditor/mobile/app/view/Toolbar.js

@@ -82,6 +82,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
 
                 this.$btnEdit = $el.find('#toolbar-edit');
                 this.$btnAdd = $el.find('#toolbar-add');