update to current fork

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "npm" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "daily"

.gitignore

@@ -5,5 +5,7 @@
 /.vs
 /node_modules
 /Scripts
+/src/transpiled
 /Pages
-/Content
+/Content
+/packages/MicrosoftAjax.4.0.20526.0

README.md

@@ -2,7 +2,7 @@
 Message Header Analyzer mail app.
 
 This is the source for the Message Header Analyzer. Install the app from the store here:
-https://store.office.com/message-header-analyzer-WA104005406.aspx
+https://appsource.microsoft.com/en-us/product/office/WA104005406
 
 ## Installation Procedure
 Because MHA requires the ReadWriteMailbox permission it can only be installed by the Administrator through the Exchange admin center. Here are some steps I put together:

deploy.cmd

@@ -111,8 +111,28 @@ IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
  popd
 )
 
-:: 4. Run npm build script
-echo 4. Run npm build script
+:: 4. Restore nuget packages
+echo 4. Restore nuget packages
+IF EXIST "%DEPLOYMENT_TARGET%\packages.config" (
+ echo Running nuget restore
+ pushd "%DEPLOYMENT_TARGET%"
+ call :ExecuteCmd nuget restore "%DEPLOYMENT_TARGET%\packages.config" -PackagesDirectory "%DEPLOYMENT_TARGET%\packages"
+ IF !ERRORLEVEL! NEQ 0 goto error
+ echo Completed nuget restore
+ popd
+)
+
+:: 5. Transpile TypeScript
+echo 5. Transpile TypeScript
+IF EXIST "%DEPLOYMENT_TARGET%\tsconfig.json" (
+ pushd "%DEPLOYMENT_TARGET%"
+ call :ExecuteCmd node %DEPLOYMENT_TARGET%\node_modules\typescript\bin\tsc -p "%DEPLOYMENT_TARGET%"
+:: IF !ERRORLEVEL! NEQ 0 goto error
+ popd
+)
+
+:: 6. Run npm build script
+echo 6. Run npm build script
 IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
  pushd "%DEPLOYMENT_TARGET%"
  call :ExecuteCmd !NPM_CMD! run build

package.json

@@ -8,9 +8,10 @@
  },
  "main": "Pages/mha.html",
  "scripts": {
- "prebuild": "npm install",
+ "ts": "tsc",
+ "prebuild": "npm install && npm run clean && tsc || exit 0",
  "build": "node tasks/build.js",
- "prebuild-debug": "node tasks/build.js debug",
+ "prebuild-debug": "npm install && npm run clean && tsc || exit 0",
  "build-debug": "node tasks/build.js debug",
  "clean": "node tasks/clean.js",
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -26,22 +27,27 @@
  },
  "homepage": "https://github.com/stephenegriffin/mha#readme",
  "dependencies": {
- "@microsoft/office-js": "^1.1.36",
+ "@microsoft/office-js": "^1.1.43",
+ "@types/jquery": "^3.5.2",
  "codepage": "^1.14.0",
- "framework7-icons": "^2.3.1",
- "jquery": "^3.5.0",
- "jwt-decode": "^2.2.0",
+ "framework7-icons": "^3.0.1",
+ "jquery": "^3.5.1",
+ "jwt-decode": "^3.0.0",
+ "moment": "^2.29.1",
  "office-ui-fabric-js": "^1.5.0",
- "stacktrace-js": "^2.0.1",
- "uglify-js": "^3.7.2"
+ "stacktrace-js": "^2.0.2",
+ "typescript": "^4.0.3",
+ "uglify-js": "^3.11.1"
  },
  "-vs-binding": {
  "BeforeBuild": [
  "clean",
+ "ts",
  "build-debug"
  ],
  "Clean": [
  "clean"
  ]
- }
+ },
+ "devDependencies": {}
 }

packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="MicrosoftAjax" version="4.0.20526.0" targetFramework="net40" />
+</packages>

src/Content/App.css

@@ -220,4 +220,8 @@ td {
  height: 44px;
  background-color: #f4f4f4;
  padding: 0;
+}
+
+.ms-Button-icon {
+ display: inline-block;
 }

src/Content/MobilePane-ios.css

@@ -20,7 +20,11 @@
 
 .tabs .tab {
  padding-top: 25px;
- background: #efeff4;
+ background: #f4f4f4;
+}
+
+.page {
+ background: #f4f4f4;
 }
 
 .content-block-title{

src/Content/uiToggle.css

@@ -28,13 +28,6 @@ body, html {
  border: none;
  }
 
-.gear-button {
- min-width: 0;
- width: 35px;
- height: 44px;
- margin-top: 1px;
-}
-
 .code-box > pre {
  background-color: #eaeaea;
  border: 1px solid #ccc;

src/Pages/Functions.html

@@ -6,7 +6,7 @@
  <title></title>
 
  <!-- Commenting out all scripts since we have no UI-less Functions
- <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.4.1.min.js"></script>
+ <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.5.1.min.js"></script>
  <script>
  // Fallback to load jQuery from a local path if the CDN is unavailable.
  (window.jQuery || document.write('<script src="/node_modules/jquery/dist/jquery.min.js"><\/script>'));
@@ -16,8 +16,6 @@
  <script>
  (window.Office || document.write('<script src="/node_modules/@microsoft/office-js/dist/office.js"><\/script>'));
  </script>
-
- <script src="/Scripts/Functions.min.js" type="text/javascript"></script>
  -->
 </head>
 <body>

src/Pages/MobilePane.html

@@ -5,19 +5,24 @@
  <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
  <title>Mobile Differentiation Page</title>
 
- <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.4.1.min.js"></script>
+ <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.5.1.min.js"></script>
  <script>
  // Fallback to load jQuery from a local path if the CDN is unavailable.
  (window.jQuery || document.write('<script src="/node_modules/jquery/dist/jquery.min.js"><\/script>'));
  </script>
 
- <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/stacktrace.js/2.0.0/stacktrace-with-promises-and-json-polyfills.min.js"></script>
+ <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/stacktrace.js/2.0.2/stacktrace-with-promises-and-json-polyfills.min.js"></script>
  <script>
  (window.StackTrace || document.write('<script src="/node_modules/stacktrace-js/dist/stacktrace-with-promises-and-json-polyfills.min.js"><\/script>'));
  </script>
 
  <script src="/Scripts/%version%/diag.min.js"></script>
 
+ <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/moment.min.js"></script>
+ <script>
+ (window.moment || document.write('<script src="/node_modules/moment/moment.min.js"><\/script>'));
+ </script>
+
  <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/framework7/1.7.1/js/framework7.min.js" type="text/javascript"></script>
 
  <script src="/Scripts/%version%/MobilePane.min.js" type="text/javascript"></script>

src/Pages/classicDesktopFrame.html

@@ -7,19 +7,24 @@
  <link rel="stylesheet" type="text/css" href="/Content/%version%/Office.css" />
  <link rel="stylesheet" type="text/css" href="/Content/%version%/App.css" />
 
- <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.4.1.min.js"></script>
+ <script crossorigin="anonymous" src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.5.1.min.js"></script>
  <script>
  // Fallback to load jQuery from a local path if the CDN is unavailable.
  (window.jQuery || document.write('<script src="/node_modules/jquery/dist/jquery.min.js"><\/script>'));
  </script>
 
- <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/stacktrace.js/2.0.0/stacktrace-with-promises-and-json-polyfills.min.js"></script>
+ <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/stacktrace.js/2.0.2/stacktrace-with-promises-and-json-polyfills.min.js"></script>
  <script>
  (window.StackTrace || document.write('<script src="/node_modules/stacktrace-js/dist/stacktrace-with-promises-and-json-polyfills.min.js"><\/script>'));
  </script>
 
  <script src="/Scripts/%version%/diag.min.js"></script>
 
+ <script crossorigin="anonymous" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/moment.min.js"></script>
+ <script>
+ (window.moment || document.write('<script src="/node_modules/moment/moment.min.js"><\/script>'));
+ </script>
+
  <script>
  if (!window.TextDecoder) {
  document.write('<script src="https://unpkg.com/[email protected]/dist/sbcs.full.js"><\/script>');
@@ -37,6 +42,8 @@
 
  <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%/poster.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>