[Pkg-mozext-commits] [greasemonkey] 37/41: Imported Upstream version 3.2~beta1

[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 f7562f2f64abae753d01f62b8571d5ba412ec8ce
Merge: cda668b ba63ca2
Author: David Prévot <david at tilapin.org>
Date:   Thu Apr 30 15:01:55 2015 -0400

    Imported Upstream version 3.2~beta1

 components/greasemonkey.js         | 14 +++++++--
 content/addons4-overlay.js         |  3 +-
 content/bindings.xml               | 39 +++++++++++++++++++++++--
 content/browser.js                 | 39 ++++++++++++++++---------
 content/config.js                  | 19 ++++++++++++
 content/framescript.js             | 32 ++++++++++++++-------
 content/menucommander.js           | 12 ++++----
 content/scriptprefs.js             | 19 ++++++++++++
 content/scriptprefs.xul            | 24 ++++++++++++----
 install.rdf                        |  4 +--
 locale/cs/gm-cludes.dtd            |  2 ++
 locale/en-US/gm-cludes.dtd         |  2 ++
 modules/installPolicy.js           | 31 ++++++++++----------
 modules/ipcscript.js               |  7 +++--
 modules/miscapis.js                | 20 ++-----------
 modules/remoteScript.js            |  1 +
 modules/sandbox.js                 |  3 +-
 modules/script.js                  | 42 ++++++++++++++++++++++-----
 modules/stats.js                   |  1 +
 modules/storageFront.js            |  2 ++
 modules/sync.js                    |  9 +++++-
 modules/util.js                    | 59 +++++++++++++++++++++++++++++++-------
 modules/util/findMessageManager.js | 12 +++++---
 modules/util/parseMetaLine.js      |  2 +-
 modules/util/showInstallDialog.js  |  4 +--
 modules/xmlhttprequester.js        | 17 +++++++++--
 skin/bindings.css                  | 16 +++++++----
 27 files changed, 319 insertions(+), 116 deletions(-)

diff --cc install.rdf
index 8f7a197,8f7a197..d9e1ba0
--- a/install.rdf
+++ b/install.rdf
@@@ -6,7 -6,7 +6,7 @@@
    <Description about="urn:mozilla:install-manifest">
  
      <em:id>{e4a8a97b-f2ed-450b-b12d-ee082ba24781}</em:id>
--    <em:version>3.1</em:version>
++    <em:version>3.2beta1</em:version>
      <em:creator>Aaron Boodman; http://youngpup.net/</em:creator>
      <em:homepageURL>http://www.greasespot.net/</em:homepageURL>
      <em:optionsURL>chrome://greasemonkey/content/options.xul</em:optionsURL>
@@@ -46,7 -46,7 +46,7 @@@
        <Description>
          <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
          <em:minVersion>35.0</em:minVersion>
--        <em:maxVersion>39.*</em:maxVersion>
++        <em:maxVersion>40.*</em:maxVersion>
        </Description>
      </em:targetApplication>
  
diff --cc modules/miscapis.js
index 8e07851,011cda7..16f4d6b
--- a/modules/miscapis.js
+++ b/modules/miscapis.js
@@@ -8,8 -8,8 +8,7 @@@ Cu.import("resource://greasemonkey/util
  
  
  var EXPORTED_SYMBOLS = [
--    'GM_addStyle', 'GM_console', 'GM_openInTab', 'GM_Resources',
--    'GM_ScriptLogger'];
++    'GM_addStyle', 'GM_console', 'GM_Resources', 'GM_ScriptLogger'];
  
  // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ //
  
@@@ -61,8 -61,8 +60,7 @@@ GM_ScriptLogger.prototype.consoleServic
  
  GM_ScriptLogger.prototype.log = function(message) {
    // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIConsoleService#logStringMessage() - wstring / wide string
--  message = message.replace(/\0/g, '');
--  this.consoleService.logStringMessage(this.prefix + '\n' + message);
++  this.consoleService.logStringMessage((this.prefix + '\n' + message).replace(/\0/g, ''));
  };
  
  // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ //

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