Merge pull request django-cms#4518 from FinalAngel/bugfix/messages

Messages bugfix
qnub · Sep 29, 2015 · 929ec7d · 929ec7d
2 parents 7a75bf1 + 37ee186
commit 929ec7d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/cms/static/cms/js/dist/bundle.admin.base.min.js b/cms/static/cms/js/dist/bundle.admin.base.min.js
diff --git a/cms/static/cms/js/dist/bundle.toolbar.min.js b/cms/static/cms/js/dist/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.base.js b/cms/static/cms/js/modules/cms.base.js
@@ -162,7 +162,6 @@ var CMS = {
 
             // sends or retrieves a JSON from localStorage or the session if local storage is not available
             setSettings: function (settings) {
-                var that = this;
                 // merge settings
                 settings = JSON.stringify($.extend({}, CMS.config.settings, settings));
                 // set loader
@@ -198,7 +197,7 @@ var CMS = {
                             }
                         },
                         error: function (jqXHR) {
-                            that.openMessage({
+                            CMS.API.Toolbar.openMessage({
                                 message: jqXHR.response + ' | ' + jqXHR.status + ' ' + jqXHR.statusText,
                                 error: true
                             });
@@ -214,7 +213,6 @@ var CMS = {
             },
 
             getSettings: function () {
-                var that = this;
                 var settings;
                 // set loader
                 if (CMS.API.Toolbar) {
@@ -244,7 +242,7 @@ var CMS = {
                             }
                         },
                         error: function (jqXHR) {
-                            that.openMessage({
+                            CMS.API.Toolbar.openMessage({
                                 message: jqXHR.response + ' | ' + jqXHR.status + ' ' + jqXHR.statusText,
                                 error: true
                             });

diff --git a/cms/static/cms/js/modules/cms.plugins.js b/cms/static/cms/js/modules/cms.plugins.js
@@ -243,7 +243,7 @@
                         CMS.API.locked = false;
                         var msg = CMS.config.lang.error;
                         // trigger error
-                        that.openMessage({
+                        CMS.API.Toolbar.openMessage({
                             message: msg + jqXHR.responseText || jqXHR.status + ' ' + jqXHR.statusText,
                             error: true
                         });
@@ -281,7 +281,6 @@
                 }
                 CMS.API.locked = true;
 
-                var that = this;
                 var move = (options || source_language) ? true : false;
                 // set correct options
                 options = options || this.options;
@@ -317,7 +316,7 @@
                         CMS.API.locked = false;
                         var msg = CMS.config.lang.error;
                         // trigger error
-                        that.openMessage({
+                        CMS.API.Toolbar.openMessage({
                             message: msg + jqXHR.responseText || jqXHR.status + ' ' + jqXHR.statusText,
                             error: true
                         });
@@ -373,7 +372,7 @@
                             CMS.API.locked = false;
                             var msg = CMS.config.lang.error;
                             // trigger error
-                            that.openMessage({
+                            CMS.API.Toolbar.openMessage({
                                 message: msg + jqXHR.responseText || jqXHR.status + ' ' + jqXHR.statusText,
                                 error: true
                             });
@@ -442,7 +441,7 @@
                         CMS.API.locked = false;
                         var msg = CMS.config.lang.error;
                         // trigger error
-                        that.openMessage({
+                        CMS.API.Toolbar.openMessage({
                             message: msg + jqXHR.responseText || jqXHR.status + ' ' + jqXHR.statusText,
                             error: true
                         });

diff --git a/cms/static/cms/js/modules/cms.toolbar.js b/cms/static/cms/js/modules/cms.toolbar.js
@@ -32,7 +32,7 @@ var CMS = window.CMS || {};
             options: {
                 preventSwitch: false,
                 preventSwitchMessage: 'Switching is disabled.',
-                messageDelay: 2000,
+                messageDelay: 3000,
                 toolbarDuration: 200
             },