[Pkg-mozext-commits] [greasemonkey] 06/20: Merge pull request #2367 from janekptacijarabaci/_parseScript_metadata_notFound

[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 b69e6d72111be64229e24e575beb7cc8bf747d72
Merge: 535d996 f321ad9
Author: arantius <arantius at gmail.com>
Date:   Fri Feb 19 15:54:52 2016 -0500

    Merge pull request #2367 from janekptacijarabaci/_parseScript_metadata_notFound
    
    GM 3.7beta3: Throws an error in the Browser Console (if metadata not found)

 modules/remoteScript.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --cc modules/remoteScript.js
index 0d97297,5bd0d66..dddad9e
--- a/modules/remoteScript.js
+++ b/modules/remoteScript.js
@@@ -414,13 -412,15 +414,15 @@@ RemoteScript.prototype.parseScript = fu
    if (this.script) return true;
  
    var scope = {};
 -  Components.utils.import('chrome://greasemonkey-modules/content/parseScript.js', scope);
 +  Cu.import('chrome://greasemonkey-modules/content/parseScript.js', scope);
    var script = scope.parse(aSource, this._uri, aFatal);
    if (!script || script.parseErrors.length) {
-     if (aFatal) {
+     if (!aFatal) {
        this.cleanup(
            stringBundle.GetStringFromName('error.parsingScript')
-           + '\n' + script.parseErrors);
+           + '\n' + (script
+               ? script.parseErrors
+               : stringBundle.GetStringFromName("error.unknown")));
      }
      return false;
    }

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