Merge pull request #46 from lutangar/features/npm

Add package.json for npm support. Thanks @lutangar
ternarylabs · Aug 11, 2016 · d3dcc86 · d3dcc86
2 parents 2d4e337 + 04e9482
commit d3dcc86
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 35 deletions.
diff --git a/example/abc.com/js/porthole.js b/example/abc.com/js/porthole.js
@@ -43,11 +43,12 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
  * MIT Licensed.
  */
 // Inspired by base2 and Prototype
-(function(){
+(function(window){
+    'use strict';
     var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
 
     // The base Class implementation (does nothing)
-    this.PortholeClass = function(){};
+    var PortholeClass = function(){};
 
     // Create a new Class that inherits from this class
     PortholeClass.extend = function(prop) {
@@ -97,14 +98,10 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
         Class.prototype.constructor = Class;
 
         // And make this class extendable
-        Class.extend = arguments.callee;
+        Class.extend = PortholeClass.extend;
 
         return Class;
     };
-})();
-
-(function (window) {
-    'use strict';
 
     /**
      * @overview Porthole, JavaScript Library for Secure Cross Domain iFrame Communication.
@@ -132,7 +129,7 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
          * @private
          */
         error: function(s) {
-            if (window.console !== undefined) {
+            if (typeof window.console !== undefined && typeof window.console.error === 'function') {
                 window.console.error('Porthole: ' + s);
             }
         }
@@ -231,6 +228,7 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
                 try {
                     this.eventListeners[i](event);
                 } catch(e) {
+                    Porthole.error(e);
                 }
             }
         }
@@ -508,9 +506,9 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
     };
 
     // Support testing in node.js:
-    if (typeof window.exports !== 'undefined') {
-        window.exports.Porthole = Porthole;
+    if (typeof exports !== 'undefined') {
+        module.exports = Porthole;
     } else {
         window.Porthole = Porthole;
     }
-})(this);
+})(typeof window !== "undefined" ? window : this);
diff --git a/example/abc.com/js/porthole.min.js b/example/abc.com/js/porthole.min.js
diff --git a/example/sandbox.ternarylabs.com/porthole/js/porthole.js b/example/sandbox.ternarylabs.com/porthole/js/porthole.js
@@ -43,11 +43,12 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
  * MIT Licensed.
  */
 // Inspired by base2 and Prototype
-(function(){
+(function(window){
+    'use strict';
     var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
 
     // The base Class implementation (does nothing)
-    this.PortholeClass = function(){};
+    var PortholeClass = function(){};
 
     // Create a new Class that inherits from this class
     PortholeClass.extend = function(prop) {
@@ -97,14 +98,10 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
         Class.prototype.constructor = Class;
 
         // And make this class extendable
-        Class.extend = arguments.callee;
+        Class.extend = PortholeClass.extend;
 
         return Class;
     };
-})();
-
-(function (window) {
-    'use strict';
 
     /**
      * @overview Porthole, JavaScript Library for Secure Cross Domain iFrame Communication.
@@ -132,7 +129,7 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
          * @private
          */
         error: function(s) {
-            if (window.console !== undefined) {
+            if (typeof window.console !== undefined && typeof window.console.error === 'function') {
                 window.console.error('Porthole: ' + s);
             }
         }
@@ -231,6 +228,7 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
                 try {
                     this.eventListeners[i](event);
                 } catch(e) {
+                    Porthole.error(e);
                 }
             }
         }
@@ -508,9 +506,9 @@ iFrame proxy abc.com->abc.com: forwardMessageEvent(event)
     };
 
     // Support testing in node.js:
-    if (typeof window.exports !== 'undefined') {
-        window.exports.Porthole = Porthole;
+    if (typeof exports !== 'undefined') {
+        module.exports = Porthole;
     } else {
         window.Porthole = Porthole;
     }
-})(this);
+})(typeof window !== "undefined" ? window : this);