Merge pull request #427 from mnphnic/expose_to_global

Expose useful variable(userContext, NS, etc...) to Global-scope.

Author: gkatsev

common/content/liberator.js

@@ -9,8 +9,15 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", modules);
 Cu.import("resource://gre/modules/AddonManager.jsm")
 
-const plugins = { __proto__: modules };
-const userContext = { __proto__: modules };
+// Use the `liberator.plugins` in place of the `plugins`.
+const plugins = Object.create(modules);
+
+// Expose userContext to Global-scope.
+Object.defineProperty(modules, "userContext", {
+    value: Object.create(modules),
+    enumerable: true,
+    writeable: true
+});
 
 const EVAL_ERROR = "__liberator_eval_error";
 const EVAL_RESULT = "__liberator_eval_result";

common/content/util.js

@@ -5,17 +5,34 @@
 
 /** @scope modules */
 
-const {XHTML, XUL, NS} = (function () {
+(function () {
     function Namespace(prefix, uri) {
         this.prefix = prefix;
         this.uri = uri;
     }
     Namespace.prototype.toString = function toString() { return this.uri; };
-    return {
-        XHTML: new Namespace("html", "http://www.w3.org/1999/xhtml"),
-        XUL  : new Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"),
-        NS   : new Namespace("liberator", "http://vimperator.org/namespaces/liberator"),
-    };
+
+    // Expose XHTML,XUL,NS to Global-scope.
+    Object.defineProperties(modules, {
+        XHTML: {
+            value: Object.freeze(
+                new Namespace("html", "http://www.w3.org/1999/xhtml")
+            ),
+            enumerable: true
+        },
+        XUL: {
+            value: Object.freeze(
+                new Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul")
+            ),
+            enumerable: true
+        },
+        NS: {
+            value: Object.freeze(
+                new Namespace("liberator", "http://vimperator.org/namespaces/liberator")
+            ),
+            enumerable: true
+        }
+    });
 })();
 
 let Encoder = Components.Constructor("@mozilla.org/layout/documentEncoder;1?type=text/plain", "nsIDocumentEncoder", "init");