[Pkg-mozext-commits] [wot] 122/226: Removed duplicate of query lib

Fri May 1 00:35:42 UTC 2015

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

taffit pushed a commit to branch master
in repository wot.

commit 966675fb1ab698d82b10380c824a6ec7769b1db4
Author: Sergey Andryukhin <sorgoz at yandex.com>
Date:   Fri Aug 23 16:52:28 2013 +0300

    Removed duplicate of query lib
---
 content/{injections => libs}/jquery-ui-1.9.2.custom.js |  0
 content/{injections => libs}/jquery.js                 |  0
 content/{rw => libs}/jquery.menu-aim.js                |  0
 content/rw/jquery.js                                   |  4 ----
 content/rw/ratingwindow.html                           |  4 ++--
 content/surveys.js                                     | 10 +++++-----
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/content/injections/jquery-ui-1.9.2.custom.js b/content/libs/jquery-ui-1.9.2.custom.js
similarity index 100%
rename from content/injections/jquery-ui-1.9.2.custom.js
rename to content/libs/jquery-ui-1.9.2.custom.js
diff --git a/content/injections/jquery.js b/content/libs/jquery.js
similarity index 100%
rename from content/injections/jquery.js
rename to content/libs/jquery.js
diff --git a/content/rw/jquery.menu-aim.js b/content/libs/jquery.menu-aim.js
similarity index 100%
rename from content/rw/jquery.menu-aim.js
rename to content/libs/jquery.menu-aim.js
diff --git a/content/rw/jquery.js b/content/rw/jquery.js
deleted file mode 100644
index 198b3ff..0000000
--- a/content/rw/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement( [...]
-f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]| [...]
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replac [...]
\ No newline at end of file
diff --git a/content/rw/ratingwindow.html b/content/rw/ratingwindow.html
index 27d72dd..ec40e28 100644
--- a/content/rw/ratingwindow.html
+++ b/content/rw/ratingwindow.html
@@ -23,8 +23,8 @@
 
 <html>
 <head>
-    <script type="text/javascript" src="chrome://wot/content/rw/jquery.js"></script>
-    <script type="text/javascript" src="chrome://wot/content/rw/jquery.menu-aim.js"></script>
+    <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/proxies.js"></script>
     <script type="text/javascript" src="chrome://wot/content/rw/wot.js"></script>
     <script type="text/javascript" src="chrome://wot/content/rw/keeper_constants.js"></script>
diff --git a/content/surveys.js b/content/surveys.js
index 7fae6a0..cae95ff 100644
--- a/content/surveys.js
+++ b/content/surveys.js
@@ -34,10 +34,10 @@ var wot_surveys = {
 	pwidth:             392,
 	px:                 10,
 	py:                 10,
-	script_base:        "resource://wot-base-dir/injections/",
-	scripts:            [ "jquery.js", "jquery-ui-1.9.2.custom.js",
-						  "wot_proxy.js", "ga_configure.js",
-						 "surveys.widgets.js", "ga_init.js"],
+	script_base:        "resource://wot-base-dir/",
+	scripts:            [ "libs/jquery.js", "libs/jquery-ui-1.9.2.custom.js",
+						  "injections/wot_proxy.js", "injections/ga_configure.js",
+						 "injections/surveys.widgets.js", "injections/ga_init.js"],
 
 	global_calm_period:   3 * 24 * 3600, // Time in seconds after asking a question before we can ask next question
 	site_calm_period:     10 * 24 * 3600, // delay between asking for the particular website if user hasn't given the feedback yet
@@ -45,7 +45,7 @@ var wot_surveys = {
 	newuser_period:       14 * 24 * 3600, // Don't ask new users (<14 days)
 
 	always_ask:         ['api.mywot.com', 'fb.mywot.com'],
-	always_ask_passwd:  "#surveymewot", // this string must be present to show survey by force
+	always_ask_passwd:  "#surveymewot", // this string must be present to show survey in forced way
 	reset_passwd:       "#wotresetsurveysettings", // this string must be present to reset timers and optout
 
 	FLAGS: {

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

