[Pkg-mozext-commits] [wot] 01/04: Imported Upstream version 20130924
David Prévot
taffit at alioth.debian.org
Wed Oct 2 11:22:06 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository wot.
commit 42fb97dd6d39ee6365c31d49d697fda434054997
Author: David Prévot <taffit at debian.org>
Date: Tue Oct 1 14:54:02 2013 -0400
Imported Upstream version 20130924
---
META-INF/manifest.mf | 8 ++++----
META-INF/zigbert.rsa | Bin 2772 -> 2772 bytes
META-INF/zigbert.sf | 8 ++++----
chrome/wot.jar!/content/api.js | 9 ++++-----
chrome/wot.jar!/content/config.js | 2 +-
chrome/wot.jar!/content/injections/wot_proxy.js | 2 +-
chrome/wot.jar!/content/prefs.js | 20 ++++++++++++++++++++
chrome/wot.jar!/content/rw/ratingwindow.html | 2 +-
chrome/wot.jar!/content/rw/wot.js | 2 +-
chrome/wot.jar!/content/util.js | 19 +++++++++++++++++++
chrome/wot.jar!/skin/ratingwindow.css | 4 ++--
install.rdf | 2 +-
12 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/META-INF/manifest.mf b/META-INF/manifest.mf
index 4e2f1a0..dd64c48 100644
--- a/META-INF/manifest.mf
+++ b/META-INF/manifest.mf
@@ -9,13 +9,13 @@ SHA1-Digest: ch4/JCA8aIe9wP1UNNoF0mbHk40=
Name: chrome/wot.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: vhm0FLnpBvXsn6UjyvZlFg==
-SHA1-Digest: qm+5puwqTXwDPW/BWhTS21557Rk=
+MD5-Digest: vfftBCVIU4h0RdWYf7p49Q==
+SHA1-Digest: cBP3vcK/cDiVYiFg5yhFs3C4CCU=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: CGtniUbPdSZgfqgAJdUw7w==
-SHA1-Digest: fQt8N8uUf/wV2rXltYQpSGIK3Cw=
+MD5-Digest: do65ka4S6y7orKTSK9Uc3A==
+SHA1-Digest: luxJ3VdpJZhmHWrwzHrekArlEOM=
Name: COPYING
Digest-Algorithms: MD5 SHA1
diff --git a/META-INF/zigbert.rsa b/META-INF/zigbert.rsa
index 6393270..2c84429 100644
Binary files a/META-INF/zigbert.rsa and b/META-INF/zigbert.rsa differ
diff --git a/META-INF/zigbert.sf b/META-INF/zigbert.sf
index e48c78a..318bdf8 100644
--- a/META-INF/zigbert.sf
+++ b/META-INF/zigbert.sf
@@ -12,13 +12,13 @@ SHA1-Digest: BnnRVkbzKBIQVW0a+wyYEddpKO4=
Name: chrome/wot.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 7cRp0Lm7Cd2+Bhh0iFQCXg==
-SHA1-Digest: 2YOc80OnypIojsUB3jm4LKpbsz4=
+MD5-Digest: EAZPu+iH80Niaw9dRvf4BA==
+SHA1-Digest: tOVveCgqOhu3AdMXgZiJ0eOeIOc=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: QQY5Oz6UsraCLh4NLTEolw==
-SHA1-Digest: hEGXABSiEzL975HxZJ75xdU9B0Q=
+MD5-Digest: GEWFdJR0uV+w/LNnH8dfWw==
+SHA1-Digest: 4y9IkJVG8rjUTJApahe2iYZW0qk=
Name: COPYING
Digest-Algorithms: MD5 SHA1
diff --git a/chrome/wot.jar!/content/api.js b/chrome/wot.jar!/content/api.js
index 75a3184..96b6eb9 100644
--- a/chrome/wot.jar!/content/api.js
+++ b/chrome/wot.jar!/content/api.js
@@ -1152,7 +1152,7 @@ var wot_keeper = {
status: status || wot_keeper.STATUSES.LOCAL
};
- wot_keeper.store_by_name(target, "comment", JSON.stringify(data));
+ wot_keeper.store_by_name(target, "comment", data);
},
remove_comment: function (target) {
@@ -1166,17 +1166,16 @@ var wot_keeper = {
// console.log("keeper.get_by_name()", target, name);
try {
- var json = wot_prefs.getChar(wot_keeper._fullname(target, name), true) || null;
- return json ? JSON.parse(json) : null;
+ return wot_prefs.getJSON(wot_keeper._fullname(target, name)) || null;
} catch (e) {
wdump("wot_keeper.get_by_name() Failed with " + e);
}
return null;
},
- store_by_name: function (target, name, data) {
+ store_by_name: function (target, name, obj) {
// console.log("keeper.store_by_name()", target, name, data);
- wot_prefs.setChar(wot_keeper._fullname(target, name), data, true);
+ wot_prefs.setJSON(wot_keeper._fullname(target, name), obj);
},
remove_by_name: function (target, name) {
diff --git a/chrome/wot.jar!/content/config.js b/chrome/wot.jar!/content/config.js
index cc8d4e8..d0bfaed 100644
--- a/chrome/wot.jar!/content/config.js
+++ b/chrome/wot.jar!/content/config.js
@@ -19,7 +19,7 @@
*/
const WOT_PLATFORM = "firefox";
-const WOT_VERSION = "20130917";
+const WOT_VERSION = "20130924";
/*
* Constants
diff --git a/chrome/wot.jar!/content/injections/wot_proxy.js b/chrome/wot.jar!/content/injections/wot_proxy.js
index de092ee..ca9fa92 100644
--- a/chrome/wot.jar!/content/injections/wot_proxy.js
+++ b/chrome/wot.jar!/content/injections/wot_proxy.js
@@ -24,7 +24,7 @@
* */
var wot = {
- version: "20130917", // TODO: init this value from the add-on core code
+ version: "20130924", // TODO: init this value from the add-on core code
platform: "firefox",
debug: false, // when changing this, don't forget to switch ga_id value also!
default_component: 0,
diff --git a/chrome/wot.jar!/content/prefs.js b/chrome/wot.jar!/content/prefs.js
index c2634c7..52cdfad 100644
--- a/chrome/wot.jar!/content/prefs.js
+++ b/chrome/wot.jar!/content/prefs.js
@@ -210,6 +210,26 @@ var wot_prefs =
return false;
},
+ getJSON: function (name, default_value) {
+ try {
+ var json = this.getChar(name, null, false);
+ return json ? JSON.parse(wot_util.utf8_to_unicode(json)) : default_value;
+ } catch (e) {
+ wdump("wot_prefs.getJSON(" + name + "): failed with " + e);
+ return default_value;
+ }
+ },
+
+ setJSON: function (name, obj) {
+ try {
+ var json = JSON.stringify(obj);
+ return this.setChar(name, wot_util.unicode_to_utf8(json), false);
+ } catch (e) {
+ wdump("wot_prefs.getJSON(" + name + "): failed with " + e);
+ return false;
+ }
+ },
+
clear: function(name)
{
try {
diff --git a/chrome/wot.jar!/content/rw/ratingwindow.html b/chrome/wot.jar!/content/rw/ratingwindow.html
index 548145a..35c2629 100644
--- a/chrome/wot.jar!/content/rw/ratingwindow.html
+++ b/chrome/wot.jar!/content/rw/ratingwindow.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<!--
@@ -23,6 +22,7 @@
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript" src="chrome://wot/content/libs/jquery.js"></script>
<script type="text/javascript" src="chrome://wot/content/libs/jquery.menu-aim.js"></script>
<script type="text/javascript" src="chrome://wot/content/rw/wot.js"></script>
diff --git a/chrome/wot.jar!/content/rw/wot.js b/chrome/wot.jar!/content/rw/wot.js
index ecc5bb9..a5786dd 100644
--- a/chrome/wot.jar!/content/rw/wot.js
+++ b/chrome/wot.jar!/content/rw/wot.js
@@ -19,7 +19,7 @@
*/
var wot = {
- version: 20130917,
+ version: 20130924,
platform: "firefox",
locale: "en", // cached value of the locale
lang: "en-US", // cached value of the lang
diff --git a/chrome/wot.jar!/content/util.js b/chrome/wot.jar!/content/util.js
index 9e228f9..d2168a3 100644
--- a/chrome/wot.jar!/content/util.js
+++ b/chrome/wot.jar!/content/util.js
@@ -122,6 +122,25 @@ var wot_util =
return decodeURIComponent(escape(s));
},
+ utf8_to_unicode: function (str) {
+ if (!str) return null;
+ var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+ .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+ converter.charset = "UTF-8";
+
+ return converter.ConvertToUnicode(str);
+ },
+
+ unicode_to_utf8: function (str) {
+ var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+ .createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+ converter.charset = "UTF-8";
+
+ var encoded = converter.ConvertFromUnicode(str);
+ return encoded + converter.Finish();
+
+ },
+
time_sincefirstrun: function()
{
try {
diff --git a/chrome/wot.jar!/skin/ratingwindow.css b/chrome/wot.jar!/skin/ratingwindow.css
index 1c27794..f6318bb 100644
--- a/chrome/wot.jar!/skin/ratingwindow.css
+++ b/chrome/wot.jar!/skin/ratingwindow.css
@@ -1682,8 +1682,8 @@ input[type=checkbox].css-checkbox:checked + label.css-label {
font-size: 14px;
text-align: right;
position: absolute;
- bottom: 55px;
- right: 50px;
+ bottom: 66px;
+ right: 56px;
background-color: #FC4B56;
padding: 3px 10px;
font-weight: normal;
diff --git a/install.rdf b/install.rdf
index d6aa2d2..4b8acca 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
<em:id>{a0d7ccb3-214d-498b-b4aa-0e8fda9a7bf7}</em:id>
<em:unpack>true</em:unpack>
<em:name>WOT</em:name>
- <em:version>20130917</em:version>
+ <em:version>20130924</em:version>
<em:description>Web of trust.</em:description>
<em:creator>WOT Services Oy</em:creator>
<em:homepageURL>http://www.mywot.com/</em:homepageURL>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/wot.git
More information about the Pkg-mozext-commits
mailing list