[Common] Change api method showMessage (2 parameter will be deprecated).

apps/api/documents/api.js

@@ -409,21 +409,12 @@
             });
         };
 
-        var _showError = function(title, msg) {
-            _showMessage(title, msg, "error");
-        };
-
-        // severity could be one of: "error", "info" or "warning"
-        var _showMessage = function(title, msg, severity) {
-            if (typeof severity !== 'string') {
-                severity = "info";
-            }
+        var _showMessage = function(title, msg) {
+            msg = msg || title;
             _sendCommand({
                 command: 'showMessage',
                 data: {
-                    title: title,
-                    msg: msg,
-                    severity: severity
+                    msg: msg
                 }
             });
         };
@@ -540,7 +531,6 @@
         };
 
         return {
-            showError           : _showError,
             showMessage         : _showMessage,
             processSaveResult   : _processSaveResult,
             processRightsChange : _processRightsChange,

apps/documenteditor/embed/js/ApplicationController.js

@@ -402,14 +402,14 @@ var ApplicationController = new(function(){
         Common.Analytics.trackEvent('Internal Error', id.toString());
     }
 
-    function onExternalError(error) {
+    function onExternalMessage(error) {
         if (error) {
             hidePreloader();
-            $('#id-error-mask-title').text(error.title);
+            $('#id-error-mask-title').text('Error');
             $('#id-error-mask-text').text(error.msg);
             $('#id-error-mask').css('display', 'block');
 
-            Common.Analytics.trackEvent('External Error', error.title);
+            Common.Analytics.trackEvent('External Error');
         }
     }
 
@@ -497,7 +497,7 @@ var ApplicationController = new(function(){
             // Initialize api gateway
             Common.Gateway.on('init',               loadConfig);
             Common.Gateway.on('opendocument',       loadDocument);
-            Common.Gateway.on('showerror',          onExternalError);
+            Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.ready();
         }
 

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

@@ -1142,7 +1142,7 @@ define([
                     msg.msg = (msg.msg).toString();
                     this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]);
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 

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

@@ -698,7 +698,7 @@ define([
                         message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
                     });
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 

apps/presentationeditor/embed/js/ApplicationController.js

@@ -506,14 +506,14 @@ var ApplicationController = new(function(){
         Common.Analytics.trackEvent('Internal Error', id.toString());
     }
 
-    function onExternalError(error) {
+    function onExternalMessage(error) {
         if (error) {
             hidePreloader();
-            $('#id-error-mask-title').text(error.title);
+            $('#id-error-mask-title').text('Error');
             $('#id-error-mask-text').text(error.msg);
             $('#id-error-mask').css('display', 'block');
 
-            Common.Analytics.trackEvent('External Error', error.title);
+            Common.Analytics.trackEvent('External Error');
         }
     }
 
@@ -573,7 +573,7 @@ var ApplicationController = new(function(){
             // Initialize api gateway
             Common.Gateway.on('init',               loadConfig);
             Common.Gateway.on('opendocument',       loadDocument);
-            Common.Gateway.on('showerror',          onExternalError);
+            Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.ready();
         }
 

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

@@ -899,7 +899,7 @@ define([
                     msg.msg = (msg.msg).toString();
                     this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]);
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 

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

@@ -659,7 +659,7 @@ define([
                         message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
                     });
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -414,14 +414,14 @@ var ApplicationController = new(function(){
         Common.Analytics.trackEvent('Internal Error', id.toString());
     }
 
-    function onExternalError(error) {
+    function onExternalMessage(error) {
         if (error) {
             hidePreloader();
-            $('#id-error-mask-title').text(error.title);
+            $('#id-error-mask-title').text('Error');
             $('#id-error-mask-text').text(error.msg);
             $('#id-error-mask').css('display', 'block');
 
-            Common.Analytics.trackEvent('External Error', error.title);
+            Common.Analytics.trackEvent('External Error');
         }
     }
 
@@ -519,7 +519,7 @@ var ApplicationController = new(function(){
             // Initialize api gateway
             Common.Gateway.on('init',               loadConfig);
             Common.Gateway.on('opendocument',       loadDocument);
-            Common.Gateway.on('showerror',          onExternalError);
+            Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.ready();
         }
 

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

@@ -965,7 +965,7 @@ define([
                     msg.msg = (msg.msg).toString();
                     this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]);
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 

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

@@ -676,7 +676,7 @@ define([
                         message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
                     });
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },