Merge tag 'staropramen' into develop

staropramen

apps/api/documents/api.js

@@ -180,6 +180,7 @@
         _config.editorConfig.canHistoryRestore = _config.events && !!_config.events.onRequestRestore;
         _config.editorConfig.canSendEmailAddresses = _config.events && !!_config.events.onRequestEmailAddresses;
         _config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights;
+        _config.frameEditorId = placeholderId;
 
         var onMouseUp = function (evt) {
             _processMouse(evt);
@@ -257,7 +258,7 @@
         };
 
         var _onMessage = function(msg) {
-            if (msg) {
+            if (msg && msg.frameEditorId == placeholderId) {
                 var events = _config.events || {},
                     handler = events[msg.event],
                     res;
@@ -662,6 +663,9 @@
                 if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + config.editorConfig.customization.loaderLogo;
             }
         }
+
+        if (config.frameEditorId)
+            params += "&frameEditorId=" + config.frameEditorId;
         
         return params;
     }

apps/common/Gateway.js

@@ -99,6 +99,7 @@ Common.Gateway = new(function() {
     var _postMessage = function(msg) {
         // TODO: specify explicit origin
         if (window.parent && window.JSON) {
+            msg.frameEditorId = window.frameEditorId;
             window.parent.postMessage(window.JSON.stringify(msg), "*");
         }
     };

apps/documenteditor/embed/index.html

@@ -239,6 +239,8 @@
                 loading = 'Loading...',
                 logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+            window.frameEditorId = params["frameEditorId"];
+
             if ( lang == 'de')      loading = 'Ladevorgang...';
             else if ( lang == 'es') loading = 'Cargando...';
             else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/embed/index.html.deploy

@@ -231,6 +231,8 @@
                 loading = 'Loading...',
                 logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+            window.frameEditorId = params["frameEditorId"];
+
             if ( lang == 'de')      loading = 'Ladevorgang...';
             else if ( lang == 'es') loading = 'Cargando...';
             else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/main/index.html

@@ -227,6 +227,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/main/index.html.deploy

@@ -227,6 +227,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/mobile/index.html

@@ -264,6 +264,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/mobile/index.html.deploy

@@ -255,6 +255,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/embed/index.html

@@ -238,6 +238,8 @@
               loading = 'Loading...',
               logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+          window.frameEditorId = params["frameEditorId"];
+
           if ( lang == 'de')      loading = 'Ladevorgang...';
           else if ( lang == 'es') loading = 'Cargando...';
           else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/embed/index.html.deploy

@@ -231,6 +231,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/main/index.html

@@ -228,6 +228,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/main/index.html.deploy

@@ -227,6 +227,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/mobile/index.html

@@ -263,6 +263,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/presentationeditor/mobile/index.html.deploy

@@ -254,6 +254,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/embed/index.html

@@ -239,6 +239,8 @@
               loading = 'Loading...',
               logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+          window.frameEditorId = params["frameEditorId"];
+
           if ( lang == 'de')      loading = 'Ladevorgang...';
           else if ( lang == 'es') loading = 'Cargando...';
           else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/embed/index.html.deploy

@@ -231,6 +231,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/main/index.html

@@ -230,6 +230,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/main/index.html.deploy

@@ -228,6 +228,8 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+        window.frameEditorId = params["frameEditorId"];
+
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/mobile/index.html

@@ -270,6 +270,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/spreadsheeteditor/mobile/index.html.deploy

@@ -255,6 +255,8 @@
                     loading = 'Loading...',
                     logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
+                window.frameEditorId = params["frameEditorId"];
+
                 if ( lang == 'de')      loading = 'Ladevorgang...';
                 else if ( lang == 'es') loading = 'Cargando...';
                 else if ( lang == 'fr') loading = 'Chargement en cours...';