[Pkg-mozext-commits] [greasemonkey] 17/41: Update script.js

David Prévot taffit at moszumanska.debian.org
Thu Apr 30 22:06:33 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 837cf6d34e99b3d1ce266f78875d1ed8c9fa89cf
Author: janekptacijarabaci <janekptacijarabaci at users.noreply.github.com>
Date:   Tue Mar 31 13:06:28 2015 +0200

    Update script.js
---
 modules/script.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/script.js b/modules/script.js
index f18c8e9..87d8481 100644
--- a/modules/script.js
+++ b/modules/script.js
@@ -1,6 +1,5 @@
 var EXPORTED_SYMBOLS = ['Script'];
 
-Components.utils.import('resource://gre/modules/AddonManager.jsm');
 Components.utils.import('resource://greasemonkey/GM_notification.js');
 Components.utils.import('resource://greasemonkey/constants.js');
 Components.utils.import('resource://greasemonkey/extractMeta.js');
@@ -525,24 +524,25 @@ Script.prototype.info = function() {
   return {
     'uuid': this.uuid,
     'version': gGreasemonkeyVersion,
+    'scriptMetaStr': extractMeta(this.textContent),
+    'scriptSource': this.textContent,
     'scriptWillUpdate': this.isRemoteUpdateAllowed(),
     'script': {
       'description': this.description,
       'excludes': this.excludes,
-      // 'icon': ???,
+      // 'icon': ??? source URL?,
       'includes': this.includes,
       'localizedDescription': this.localized.description,
       'localizedName': this.localized.name,
       'matches': matches,
       'name': this.name,
       'namespace': this.namespace,
-      // 'requires': ???,
+      'noframes': this.noframes,
+      // 'requires': ??? source URL?,
       'resources': resources,
       'run-at': this.runAt,
       'version': this.version,
     },
-    'scriptMetaStr': extractMeta(this.textContent),
-    'scriptSource': this.textContent,
   };
 };
 
@@ -725,7 +725,7 @@ Script.prototype.updateFromNewScript = function(newScript, url, windowId, browse
               "greasemonkey:inject-script",
               {
                 windowId: pendingExec.windowId,
-                script: new IPCScript(this)
+                script: new IPCScript(this, gGreasemonkeyVersion)
               });
         }
       }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git



More information about the Pkg-mozext-commits mailing list