Merge pull request #298 from whiteout-io/dev/wo-897

Use iframe-resizer

Author: Felix Hammerl

Gruntfile.js

@@ -265,6 +265,7 @@ module.exports = function(grunt) {
                     'src/lib/angular/angular-animate.js',
                     'src/lib/ngtagsinput/ng-tags-input.min.js',
                     'node_modules/ng-infinite-scroll/build/ng-infinite-scroll.min.js',
+                    'node_modules/iframe-resizer/js/iframeResizer.min.js',
                     'src/lib/fastclick/fastclick.js',
                     'src/lib/lawnchair/lawnchair-git.js',
                     'src/lib/lawnchair/lawnchair-adapter-webkit-sqlite-git.js',
@@ -283,6 +284,7 @@ module.exports = function(grunt) {
             readSandbox: {
                 src: [
                     'node_modules/dompurify/purify.js',
+                    'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js',
                     'src/js/controller/app/read-sandbox.js'
                 ],
                 dest: 'dist/js/read-sandbox.min.js'

package.json

@@ -62,6 +62,7 @@
     "grunt-string-replace": "~1.0.0",
     "grunt-svgmin": "~1.0.0",
     "grunt-svgstore": "~0.3.4",
+    "iframe-resizer": "^2.8.3",
     "imap-client": "~0.11.0",
     "jquery": "~2.1.1",
     "mailreader": "~0.4.0",
@@ -74,4 +75,4 @@
     "time-grunt": "^1.0.0",
     "wo-smtpclient": "~0.6.0"
   }
-}
+}

res/aws_release.sh

@@ -14,8 +14,8 @@ fi
 
 # switch branch
 git checkout $2
-git branch release/$1
-git checkout release/$1
+git branch -D release/$1
+git checkout -b release/$1
 git merge $2 --no-edit
 
 # build and test

src/js/controller/app/read-sandbox.js

@@ -6,7 +6,7 @@ window.onmessage = function(e) {
 
     if (e.data.html) {
         // display html mail body
-        html = '<div class="scale-body">' + e.data.html + '</div>';
+        html = e.data.html;
     } else if (e.data.text) {
         // diplay text mail body by with colored conversation nodes
         html = renderNodes(parseConversation(e.data.text));
@@ -26,10 +26,34 @@ window.onmessage = function(e) {
 
     document.body.innerHTML = html;
 
-    scaleToFit();
+    attachClickHandlers();
 };
 
-window.addEventListener('resize', scaleToFit);
+/**
+ * Send a message to the main window when email address is clicked
+ */
+function attachClickHandlers() {
+    var elements = document.getElementsByTagName('a');
+    for (var i = 0, len = elements.length; i < len; i++) {
+        elements[i].onclick = handle;
+    }
+
+    function handle(e) {
+        var text = e.target.textContent || e.target.innerText;
+        if (checkEmailAddress(text)) {
+            e.preventDefault();
+            window.parentIFrame.sendMessage({
+                type: 'email',
+                address: text
+            });
+        }
+    }
+
+    function checkEmailAddress(text) {
+        var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        return re.test(text);
+    }
+}
 
 /**
  * Parse email body and generate conversation nodes
@@ -188,28 +212,4 @@ function renderNodes(root) {
     }
 
     return '<div class="view-read-body">' + body + '</div>';
-}
-
-/**
- * Transform scale content to fit iframe width
- */
-function scaleToFit() {
-    var view = document.getElementsByClassName('scale-body').item(0);
-    if (!view) {
-        return;
-    }
-
-    var parentWidth = view.parentNode.offsetWidth;
-    var w = view.offsetWidth;
-    var scale = '';
-
-    if (w > parentWidth) {
-        scale = parentWidth / w;
-        scale = 'scale(' + scale + ',' + scale + ')';
-    }
-
-    view.style['-webkit-transform-origin'] = '0 0';
-    view.style.transformOrigin = '0 0';
-    view.style['-webkit-transform'] = scale;
-    view.style.transform = scale;
 }

src/js/controller/app/write.js

@@ -158,7 +158,7 @@ var WriteCtrl = function($scope, $window, $filter, $q, appConfig, auth, keychain
         if (forward) {
             $scope.subject = 'Fwd: ' + re.subject;
         } else {
-            $scope.subject = 'Re: ' + ((re.subject) ? re.subject.replace('Re: ', '') : '');
+            $scope.subject = re.subject ? 'Re: ' + re.subject.replace('Re: ', '') : '';
         }
 
         // fill text body