consolidate messaging code

ohne-ende · Sep 13, 2020 · 8f045b9 · 8f045b9
1 parent 4dfd4e9
commit 8f045b9
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 41 deletions.
diff --git a/debug.log b/debug.log
@@ -0,0 +1 @@
+[0913/100111.123:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
diff --git a/src/Pages/classicDesktopFrame.html b/src/Pages/classicDesktopFrame.html
@@ -43,6 +43,7 @@
  <script src="/node_modules/jwt-decode/build/jwt-decode.min.js"></script>
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Antispam.min.js"></script>
  <script src="/Scripts/%version%/ForefrontAntispam.min.js"></script>
  <script src="/Scripts/%version%/2047.min.js"></script>

diff --git a/src/Pages/mha.html b/src/Pages/mha.html
@@ -43,6 +43,7 @@
 
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Antispam.min.js"></script>
  <script src="/Scripts/%version%/ForefrontAntispam.min.js"></script>
  <script src="/Scripts/%version%/2047.min.js"></script>

diff --git a/src/Pages/newDesktopFrame.html b/src/Pages/newDesktopFrame.html
@@ -47,6 +47,7 @@
 
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Antispam.min.js"></script>
  <script src="/Scripts/%version%/ForefrontAntispam.min.js"></script>
  <script src="/Scripts/%version%/2047.min.js"></script>

diff --git a/src/Pages/newMobilePaneIosFrame.html b/src/Pages/newMobilePaneIosFrame.html
@@ -48,6 +48,7 @@
 
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Antispam.min.js"></script>
  <script src="/Scripts/%version%/ForefrontAntispam.min.js"></script>
  <script src="/Scripts/%version%/2047.min.js"></script>

diff --git a/src/Pages/parentframe.html b/src/Pages/parentframe.html
@@ -40,6 +40,7 @@
  <script src="/node_modules/jwt-decode/build/jwt-decode.min.js"></script>
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Errors.min.js"></script>
  <script src="/Scripts/%version%/GetHeaders.min.js"></script>
  <script src="/Scripts/%version%/GetHeadersEWS.min.js"></script>

diff --git a/src/Pages/unittests.html b/src/Pages/unittests.html
@@ -38,6 +38,7 @@
  </script>
  <script src="/Scripts/%version%/Strings.min.js"></script>
  <script src="/Scripts/%version%/Dates.min.js"></script>
+ <script src="/Scripts/%version%/message.min.js"></script>
  <script src="/Scripts/%version%/Antispam.min.js"></script>
  <script src="/Scripts/%version%/ForefrontAntispam.min.js"></script>
  <script src="/Scripts/%version%/2047.min.js"></script>

diff --git a/src/Scripts/Default.js b/src/Scripts/Default.js
@@ -2,6 +2,7 @@
 /* global mhaStrings */
 /* global HeaderModel */
 /* global Table */
+/* global message */
 
 // This is the "classic" UI rendered in classicDesktopFrame.html
 
@@ -15,22 +16,16 @@
  Table.initializeTableUI(viewModel);
  updateStatus(mhaStrings.mha_loading);
  window.addEventListener("message", eventListener, false);
- postMessageToParent("frameActive");
+ message.postMessageToParent("frameActive");
  }
  catch (e) {
  postError(e, "Failed initializing frame");
  showError(e, "Failed initializing frame");
  }
  });
 
- function site() { return window.location.protocol + "//" + window.location.host; }
-
- function postMessageToParent(eventName, data) {
- window.parent.postMessage({ eventName: eventName, data: data }, site());
- }
-
  function eventListener(event) {
- if (!event || event.origin !== site()) return;
+ if (!event || event.origin !== message.site()) return;
 
  if (event.data) {
  switch (event.data.eventName) {
@@ -48,7 +43,7 @@
  }
 
  function postError(error, message) {
- postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
+ message.postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
  }
 
  function enableSpinner() {

diff --git a/src/Scripts/DesktopPane.js b/src/Scripts/DesktopPane.js
@@ -1,6 +1,7 @@
 /* global $ */
 /* global mhaStrings */
 /* global HeaderModel */
+/* global message */
 
 // This is the "new" UI rendered in newDesktopFrame.html
 
@@ -13,22 +14,16 @@
  initializeFabric();
  updateStatus(mhaStrings.mha_loading);
  window.addEventListener("message", eventListener, false);
- postMessageToParent("frameActive");
+ message.postMessageToParent("frameActive");
  }
  catch (e) {
  postError(e, "Failed initializing frame");
  showError(e, "Failed initializing frame");
  }
  });
 
- function site() { return window.location.protocol + "//" + window.location.host; }
-
- function postMessageToParent(eventName, data) {
- window.parent.postMessage({ eventName: eventName, data: data }, site());
- }
-
  function eventListener(event) {
- if (!event || event.origin !== site()) return;
+ if (!event || event.origin !== message.site()) return;
 
  if (event.data) {
  switch (event.data.eventName) {
@@ -46,7 +41,7 @@
  }
 
  function postError(error, message) {
- postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
+ message.postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
  }
 
  function initializeFabric() {
@@ -267,7 +262,6 @@
  var tbody;
  var table;
  var row;
- var linkVal;
  if (viewModel.forefrontAntiSpamReport.forefrontAntiSpamRows.length > 0) {
  $("<div/>")
  .addClass("ms-font-m")

diff --git a/src/Scripts/Headers.js b/src/Scripts/Headers.js
@@ -4,6 +4,7 @@
 /* global Other */
 /* global Received */
 /* global Summary */
+/* global message */
 /* exported HeaderModel */
 
 var HeaderModel = (function (headers) {
@@ -126,15 +127,9 @@ var HeaderModel = (function (headers) {
  return ret.join("\n\n");
  }
 
- function site() { return window.location.protocol + "//" + window.location.host; }
-
- function postMessageToParent(eventName, data) {
- window.parent.postMessage({ eventName: eventName, data: data }, site());
- }
-
  if (headers) {
  parseHeaders(headers);
- postMessageToParent("modelToString", toString());
+ message.postMessageToParent("modelToString", toString());
  }
 
  return {

diff --git a/src/Scripts/MobilePane-ios.js b/src/Scripts/MobilePane-ios.js
@@ -3,6 +3,7 @@
 /* global moment */
 /* global mhaStrings */
 /* global HeaderModel */
+/* global message */
 
 // This is the "new-mobile" UI rendered in newMobilePaneIosFrame.html
 
@@ -15,22 +16,16 @@
  initializeFramework7();
  updateStatus(mhaStrings.mha_loading);
  window.addEventListener("message", eventListener, false);
- postMessageToParent("frameActive");
+ message.postMessageToParent("frameActive");
  }
  catch (e) {
  postError(e, "Failed initializing frame");
  showError(e, "Failed initializing frame");
  }
  });
 
- function site() { return window.location.protocol + "//" + window.location.host; }
-
- function postMessageToParent(eventName, data) {
- window.parent.postMessage({ eventName: eventName, data: data }, site());
- }
-
  function eventListener(event) {
- if (!event || event.origin !== site()) return;
+ if (!event || event.origin !== message.site()) return;
 
  if (event.data) {
  switch (event.data.eventName) {
@@ -48,7 +43,7 @@
  }
 
  function postError(error, message) {
- postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
+ message.postMessageToParent("LogError", { error: JSON.stringify(error), message: message });
  }
 
  function initializeFramework7() {

diff --git a/src/Scripts/message.js b/src/Scripts/message.js
@@ -0,0 +1,21 @@
+/* exported message*/
+
+var message = (function () {
+ function site() { return window.location.protocol + "//" + window.location.host; }
+
+ function postMessageToFrame(frame, eventName, data) {
+ if (frame) {
+ frame.postMessage({ eventName: eventName, data: data }, site());
+ }
+ }
+
+ function postMessageToParent(eventName, data) {
+ window.parent.postMessage({ eventName: eventName, data: data }, site());
+ }
+
+ return {
+ postMessageToParent: postMessageToParent,
+ postMessageToFrame: postMessageToFrame,
+ site: site
+ }
+})();
diff --git a/src/Scripts/uiToggle.js b/src/Scripts/uiToggle.js
@@ -5,6 +5,7 @@
 /* global Diagnostics */
 /* global Errors */
 /* global GetHeaders */
+/* global message */
 /* exported ParentFrame */
 
 // Controller for Settings screen which controls what is being displayed
@@ -54,16 +55,12 @@ var ParentFrame = (function () {
  return null;
  }
 
- function site() { return window.location.protocol + "//" + window.location.host; }
-
  function postMessageToFrame(eventName, data) {
- if (iFrame) {
- iFrame.postMessage({ eventName: eventName, data: data }, site());
- }
+ message.postMessageToFrame(iFrame, eventName, data);
  }
 
  function eventListener(event) {
- if (!event || event.origin !== site()) return;
+ if (!event || event.origin !== message.site()) return;
 
  if (event.data) {
  switch (event.data.eventName) {

diff --git a/tasks/build.js b/tasks/build.js
@@ -81,6 +81,7 @@ const targets = {
  "GetHeadersEWS.min.js": ["GetHeadersEWS.js"],
  "GetHeadersRest.min.js": ["GetHeadersRest.js"],
  "Headers.min.js": ["Headers.js"],
+ "message.min.js": ["message.js"],
  "MobilePane-ios.min.js": ["MobilePane-ios.js"],
  "MobilePane.min.js": ["MobilePane.js"],
  "Other.min.js": ["Other.js"],