[Pkg-mozext-commits] [greasemonkey] 26/55: Merge remote-tracking branch 'the8472/async-messages2' into the-async

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 6fe96d6da1d42bb80523713a62b27be69021eb83
Merge: c274845 70fab3e
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Sep 23 17:32:36 2015 -0400

    Merge remote-tracking branch 'the8472/async-messages2' into the-async
    
    # Conflicts:
    #	modules/xmlhttprequester.js

 components/greasemonkey.js | 82 +++++++++++++++++++++++++++-------------
 content/framescript.js     | 11 +-----
 modules/abstractScript.js  | 54 +++++++++++++++++++++++++++
 modules/ipcscript.js       | 93 +++++++++++++++++++++++++++++++++++++++-------
 modules/miscapis.js        |  7 +++-
 modules/sandbox.js         | 83 ++++++++++++++++++++++++++++++++++-------
 modules/script.js          | 37 +++++-------------
 modules/util.js            |  1 +
 modules/util/fileXHR.js    | 15 ++++++++
 9 files changed, 292 insertions(+), 91 deletions(-)

diff --cc components/greasemonkey.js
index 1c3ce92,5e1f909..a661629
--- a/components/greasemonkey.js
+++ b/components/greasemonkey.js
@@@ -82,6 -81,27 +81,25 @@@ function startup(aService) 
    // Why?  Who knows!?
    globalMessageManager.loadFrameScript(
        'chrome://greasemonkey/content/framescript.js', true);
+   
+ 
+   
+   // beam down initial set of scripts
+   aService.broadcastScriptUpdates();
+   
+   // notification is async
+   // send the scripts again once we have our version
+   AddonManager.getAddonByID(GM_GUID, function(addon) {
+     gGreasemonkeyVersion = '' + addon.version;
+     aService.broadcastScriptUpdates();
+   });
+   
+   // beam down on updates
+   aService.config.addObserver({notifyEvent: function(script, event, data) {
+     if(["modified", "install", "move", "edit-enabled", "uninstall"].some(function(e) {return e == event;})) {
+       aService.broadcastScriptUpdates();
+     }
+   }});
 -  
 -  Cu.import("chrome://greasemonkey-modules/content/refererSetter.js", {});
  
    Services.obs.addObserver(aService, 'quit-application', false);
  

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