[Pkg-mozext-commits] [greasemonkey] 08/10: Imported Upstream version 1.16~beta6
David Prévot
taffit at moszumanska.debian.org
Thu May 29 17:26:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository greasemonkey.
commit 06ff1696fbb377269838719dda0be42700c7457b
Merge: f4ba38a 2fbb939
Author: David Prévot <taffit at debian.org>
Date: Thu May 29 12:34:20 2014 -0400
Imported Upstream version 1.16~beta6
components/greasemonkey.js | 9 ++-
content/third-party/addons4.css | 108 +++++++++++++++++------------------
defaults/preferences/greasemonkey.js | 1 +
install.rdf | 2 +-
modules/scriptIcon.js | 100 ++++++++++++++++----------------
modules/util/isGreasemonkeyable.js | 2 +
6 files changed, 112 insertions(+), 110 deletions(-)
diff --cc content/third-party/addons4.css
index 01b80de,01b80de..225071c
--- a/content/third-party/addons4.css
+++ b/content/third-party/addons4.css
@@@ -1,54 -1,54 +1,54 @@@
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is the Extension Manager UI.
-- *
-- * The Initial Developer of the Original Code is
-- * the Mozilla Foundation.
-- * Portions created by the Initial Developer are Copyright (C) 2010
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Blair McBride <bmcbride at mozilla.com>
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either the GNU General Public License Version 2 or later (the "GPL"), or
-- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
-- /* Derived from: chrome://mozapps/skin/extensions/extensions.css
-- * Firefox 4.0b10
-- */
--
--.sorter[checkState="1"],
--.sorter[checkState="2"] {
-- background-color: rgba(194, 200, 206, 0.4);
-- box-shadow: 1px 1px 2px #B6BBC4 inset;
--}
--
--.sorter[checkState="1"] {
-- list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
--}
--
--.sorter[checkState="2"] {
-- list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
--}
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Extension Manager UI.
++ *
++ * The Initial Developer of the Original Code is
++ * the Mozilla Foundation.
++ * Portions created by the Initial Developer are Copyright (C) 2010
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * Blair McBride <bmcbride at mozilla.com>
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++ /* Derived from: chrome://mozapps/skin/extensions/extensions.css
++ * Firefox 4.0b10
++ */
++
++.sorter[checkState="1"],
++.sorter[checkState="2"] {
++ background-color: rgba(194, 200, 206, 0.4);
++ box-shadow: 1px 1px 2px #B6BBC4 inset;
++}
++
++.sorter[checkState="1"] {
++ list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
++}
++
++.sorter[checkState="2"] {
++ list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
++}
diff --cc modules/scriptIcon.js
index f492b04,f492b04..3ed5aa0
--- a/modules/scriptIcon.js
+++ b/modules/scriptIcon.js
@@@ -1,50 -1,50 +1,50 @@@
--var EXPORTED_SYMBOLS = ['ScriptIcon'];
--
--Components.utils.import('resource://greasemonkey/scriptDependency.js');
--Components.utils.import('resource://greasemonkey/util.js');
--
--var stringBundle = Components
-- .classes["@mozilla.org/intl/stringbundle;1"]
-- .getService(Components.interfaces.nsIStringBundleService)
-- .createBundle("chrome://greasemonkey/locale/greasemonkey.properties");
--
--ScriptIcon.prototype = new ScriptDependency();
--ScriptIcon.prototype.constructor = ScriptIcon;
--function ScriptIcon(aScript) {
-- ScriptDependency.call(this, aScript);
-- this.type = 'ScriptIcon';
--}
--
--ScriptIcon.prototype.__defineGetter__('fileURL',
--function ScriptIcon_getFileURL() {
-- if (this._dataURI) {
-- return this._dataURI;
-- } else if (this._filename) {
-- return GM_util.getUriFromFile(this.file).spec;
-- } else {
-- return 'chrome://greasemonkey/skin/userscript.png';
-- }
--});
--
--ScriptIcon.prototype.__defineSetter__('fileURL',
--function ScriptIcon_setFileURL(iconURL) {
-- if (/^data:/i.test(iconURL)) {
-- // icon is a data scheme
-- this._dataURI = iconURL;
-- } else if (iconURL) {
-- // icon is a file
-- this._filename = iconURL;
-- }
--});
--
--ScriptIcon.prototype.setMetaVal = function(value) {
-- // accept data uri schemes for image mime types
-- if (/^data:image\//i.test(value)) {
-- this._dataURI = value;
-- } else if (/^data:/i.test(value)) {
-- throw new Error(stringBundle.GetStringFromName('icon.uri-image-type'));
-- } else {
-- var resUri = GM_util.uriFromUrl(this._script._downloadURL);
-- this._downloadURL = GM_util.uriFromUrl(value, resUri).spec;
-- }
--};
++var EXPORTED_SYMBOLS = ['ScriptIcon'];
++
++Components.utils.import('resource://greasemonkey/scriptDependency.js');
++Components.utils.import('resource://greasemonkey/util.js');
++
++var stringBundle = Components
++ .classes["@mozilla.org/intl/stringbundle;1"]
++ .getService(Components.interfaces.nsIStringBundleService)
++ .createBundle("chrome://greasemonkey/locale/greasemonkey.properties");
++
++ScriptIcon.prototype = new ScriptDependency();
++ScriptIcon.prototype.constructor = ScriptIcon;
++function ScriptIcon(aScript) {
++ ScriptDependency.call(this, aScript);
++ this.type = 'ScriptIcon';
++}
++
++ScriptIcon.prototype.__defineGetter__('fileURL',
++function ScriptIcon_getFileURL() {
++ if (this._dataURI) {
++ return this._dataURI;
++ } else if (this._filename) {
++ return GM_util.getUriFromFile(this.file).spec;
++ } else {
++ return 'chrome://greasemonkey/skin/userscript.png';
++ }
++});
++
++ScriptIcon.prototype.__defineSetter__('fileURL',
++function ScriptIcon_setFileURL(iconURL) {
++ if (/^data:/i.test(iconURL)) {
++ // icon is a data scheme
++ this._dataURI = iconURL;
++ } else if (iconURL) {
++ // icon is a file
++ this._filename = iconURL;
++ }
++});
++
++ScriptIcon.prototype.setMetaVal = function(value) {
++ // accept data uri schemes for image mime types
++ if (/^data:image\//i.test(value)) {
++ this._dataURI = value;
++ } else if (/^data:/i.test(value)) {
++ throw new Error(stringBundle.GetStringFromName('icon.uri-image-type'));
++ } else {
++ var resUri = GM_util.uriFromUrl(this._script._downloadURL);
++ this._downloadURL = GM_util.uriFromUrl(value, resUri).spec;
++ }
++};
--
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