June 2017 - tor-commits - lists.torproject.org

[tor-browser-spec/master] Bug 21249: Update release process documentation
by gk＠torproject.org 16 Jun '17

16 Jun '17

commit a6a9e1a534e8d14f511401f7cbd915f410ad2174 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 16 11:07:13 2017 +0000 Bug 21249: Update release process documentation We add instructions covering our signing procedures --- processes/ReleaseProcess | 59 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index e4d261e..55c31a4 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -70,29 +70,68 @@ # For stable releases put tails-dev(a)boum.org into Cc #. Code Sign the OS X dmg files: - # XXX: Document + torsocks ssh mac-signer "mkdir $TORBROWSER_VERSION" + torsocks rsync -avP $TORBROWSER_BUILDDIR/*.dmg mac-signer:$TORBROWSER_VERSION/ + torsocks ssh mac-signer + # Unlock the keychain and then... + cd $TORBROWSER_VERSION + # Sign the bundles + ../gatekeeper-signing.sh $TORBROWSER_VERSION + # Check that it worked + tar xf torbrowser-$TORBROWSER_VERSION-osx_zh-CN-signed.tar.bz2 + spctl -a -t exec -vv TorBrowser.app/ + rm -rf TorBrowser.app + exit + torsocks rsync -avP mac-signer:$TORBROWSER_VERSION/*.bz2 . #. Regenerate OS X MAR files from code signed dmg files + # XXX Go to your directory prepared for recreating the .dmg files and containing + # the uploaded .bz2 files + ./gatekeeper-bundling.sh $TORBROWSER_VERSION + rsync -avP *.dmg $TORBROWSER_BUILDDIR/ + cd $TORBROWSER_BUILDDIR/.. # The code signed dmg files should be in the $TORBROWSER_VERSION directory # Install a recent p7zip version (see ../tools/dmg2mar for instructions) make dmg2mars # or dmg2mars-alpha #. Sign the MAR update files - # First, copy the torbrowser tree to removable storage: - rsync -avP $TORBROWSER_BUILDDIR/../../../ /media/storage/TBB/ - # Then, remove storage, attach to offline computer that houses TBB signing key. - # Run the following from that rsync'ed removable storage dir: + # First, copy the torbrowser tree to the signing machine: + torsocks rsync -avP $TORBROWSER_BUILDDIR/../../../ signing-machine + torsocks ssh signing-machine "mkdir tor-browser-bundle/gitian/$TORBROWSER_VERSION" + torsocks rsync -avP $TORBROWSER_BUILDDIR/*.mar signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/ + torsocks ssh signing-machine + cd tor-browser-bundle/gitian + # XXX Modify the signmars.sh script to comment out the eval call. + export TORBROWSER_VERSION=$TORBROWSER_VERSION export NSS_DB_DIR=/path/to/nssdb # Only needed if you are not owner of the marsigner cert export NSS_CERTNAME=your_certname make signmars - # Now, re-attach storage to the online computer, and sync the signed - # results to a version-only directory (without the build number) - torsocks ssh people.torproject.org "cp -a public_html/builds/$TORBROWSER_BUILDDIR public_html/builds/$TORBROWSER_VERSION" - torsocks rsync -avP /media/storage/TBB/tor-browser-bundle/gitian/$TORBROWSER_BUILDDIR/*.mar people.torproject.org:public_html/builds/$TORBROWSER_VERSION + exit + torsocks rsync -avP signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/*.mar $TORBROWSER_BUILDDIR/ #. Sign individual bundle files: - # XXX: Document + # Authenticode signing first + torsocks ssh windows-signing-machine "mkdir tor-browser-bundle/gitian/$TORBROWSER_VERSION" + torsocks rsync -avP $TORBROWSER_BUILDDIR/*.exe windows-signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/ + torsocks ssh windows-signing-machine + cd tor-browser-bundle/gitian/$TORBROWSER_VERSION + /path/to/authenticode-signing.sh + exit + torsocks rsync -avP window-signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/*.mar $TORBROWSER_BUILDDIR/ + # Authenticode timestamping next + cd $TORBROWSER_BUILDDIR + export OSSLSIGNCODE=/path/to/osslsigncode + /path/to/authenticode-timestamping.sh + + # All the GPG signatures at last + torsocks rsync -avP $TORBROWSER_BUILDDIR/* signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/ + cd tor-browser-bundle/gitian/$TORBROWSER_VERSION + /path/to/tbb-signing.sh + exit + +#. Sync to people.torproject.org + torsocks rsync -avP $TORBROWSER_VERSION/ people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR #. Clear out old builds, transfer builds to staticiforme #. Remote:

1 0

[tor-browser-spec/master] Fix errors in release process documentation
by gk＠torproject.org 16 Jun '17

16 Jun '17

commit f8890fccbb3b5349c869760bc18a6dd610667393 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 16 11:15:19 2017 +0000 Fix errors in release process documentation --- processes/ReleaseProcess | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 55c31a4..e4aa4e4 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -118,7 +118,7 @@ cd tor-browser-bundle/gitian/$TORBROWSER_VERSION /path/to/authenticode-signing.sh exit - torsocks rsync -avP window-signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/*.mar $TORBROWSER_BUILDDIR/ + torsocks rsync -avP window-signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/*.exe $TORBROWSER_BUILDDIR/ # Authenticode timestamping next cd $TORBROWSER_BUILDDIR export OSSLSIGNCODE=/path/to/osslsigncode @@ -129,9 +129,11 @@ cd tor-browser-bundle/gitian/$TORBROWSER_VERSION /path/to/tbb-signing.sh exit + torsocks rsync -avP signing-machine:tor-browser-bundle/gitian/$TORBROWSER_VERSION/ $TORBROWSER_BUILDDIR #. Sync to people.torproject.org - torsocks rsync -avP $TORBROWSER_VERSION/ people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR + torsocks rsync -avP $TORBROWSER_BUILDDIR/ people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR + torsocks ssh people.torproject.org "mv public_html/$TORBROWSER_BUILDDIR public_html/$TORBROWSER_VERSION" #. Clear out old builds, transfer builds to staticiforme #. Remote:

1 0

[webwml/master] Move scripts to their own js file
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 17643b01962fabf590b6b76959b9fb3efb511c85 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 11:16:38 2017 +0200 Move scripts to their own js file --- docs/torbutton/en/index.wml | 82 ++++----------------------------------------- en/index.wml | 5 +-- include/thankyou-head.wmi | 27 +++++++-------- js/animate.js | 8 +++++ js/functions.js | 65 +++++++++++++++++++++++++++++++++++ rule-41/banner.html | 19 +++-------- 6 files changed, 98 insertions(+), 108 deletions(-) diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml index 1070239..f947b96 100644 --- a/docs/torbutton/en/index.wml +++ b/docs/torbutton/en/index.wml @@ -8,81 +8,14 @@ <a href="<page index>">Home » </a> <a href="<page docs/torbutton/index>">Torbutton</a> </div> - <div id="maincol"> + <div id="maincol">  - + <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> - <script type="text/javascript"> - - function addSearchProvider(prov) { - - try { - window.external.AddSearchProvider(prov); - } - - catch (e) { - alert("Search plugins require Firefox 2"); - return; - } - } - - function addEngine(name,ext,cat,pid) - { - if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) { - window.sidebar.addSearchEngine( - "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src", - "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat ); - } else { - alert("You will need a browser which supports Sherlock to install this plugin."); - } - } - - function addOpenSearch(name,ext,cat,pid,meth) - { - if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { - if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { - alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); - } else { - window.external.AddSearchProvider( - "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); - } - } else { - alert("You will need a browser which supports OpenSearch to install this plugin."); - } - } - - function addOpenSearch2(name,ext,cat,pid,meth) - { - if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { - if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { - alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); - } else { - window.external.AddSearchProvider( - "http://torbutton.torproject.org/dev/search/" + name + ".xml"); - } - } else { - alert("You will need a browser which supports OpenSearch to install this plugin."); - } - } - - function install (aEvent) - { - var params = { - "Torbutton": { URL: aEvent.target.href, - Hash: aEvent.target.getAttribute("hash"), - toString: function () { return this.URL; } - } - }; - InstallTrigger.install(params); - - return false; - } - - - </script> - + <script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script> + <h2>Torbutton</h2> <hr> @@ -110,12 +43,12 @@ repository</a> or simply unzip the xpi. <br/> <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/> - <strong>Documents:</strong> - <b>[</b> + <strong>Documents:</strong> + <b>[</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/CHANGELOG">changelog</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/LICENSE">license</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/CREDITS">credits</a> <b>]</b> - + </div>  <div id = "sidecol"> @@ -126,4 +59,3 @@ </div>  #include <foot.wmi> - diff --git a/en/index.wml b/en/index.wml index 836d3b0..a228691 100644 --- a/en/index.wml +++ b/en/index.wml @@ -65,10 +65,7 @@ browse the Internet.</p> </div> </td> - <td> - <div class="project"> - <a href="https://guardianproject.info/apps/orbot/"><img - src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> + <td><meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> <p>Tor for Google Android devices.</p> </div> diff --git a/include/thankyou-head.wmi b/include/thankyou-head.wmi index 388944e..661dde0 100644 --- a/include/thankyou-head.wmi +++ b/include/thankyou-head.wmi @@ -14,7 +14,7 @@ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - # begin WML to generate css/js paths + # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> @@ -29,17 +29,14 @@ <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css"> <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths + # end WML to generate css/js paths <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="The Tor Project, Inc."> <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> <script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> -<script type="text/javascript" charset="utf-8"> -/* email placeholder function */ - $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); -</script> +<script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script> </head> <body> <div id="wrap"> @@ -63,9 +60,9 @@ my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory of active link, set class active + # in directory of active link, set class active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { $class = 'class="active"'; @@ -74,12 +71,12 @@ } $dir = '.' unless defined $dir; - + # translated version if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; - } + } # english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", @@ -108,14 +105,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), my $val = shift @calltoaction; push @keys, $key; $calltoaction{$key} = $val; - } + } my $page = $WML_SRC_BASENAME; my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory, set active + # in directory, set active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { #if ($WML_SRC_BASENAME eq $base) { @@ -129,7 +126,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } + } # default to english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", @@ -137,7 +134,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), } else { warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; } - } + } }:> </ul> </div> diff --git a/js/animate.js b/js/animate.js new file mode 100644 index 0000000..a789365 --- /dev/null +++ b/js/animate.js @@ -0,0 +1,8 @@ +document.addEventListener("DOMContentLoaded", function(event) { + var animate = document.getElementById("animate"); + animate.classList.add("not-loaded"); + window.setTimeout(function () { + animate.classList.remove("not-loaded"); + animate.classList.add("loaded"); + }, 0); +}); diff --git a/js/functions.js b/js/functions.js new file mode 100644 index 0000000..661ad81 --- /dev/null +++ b/js/functions.js @@ -0,0 +1,65 @@ +$(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); + +function addSearchProvider(prov) { + +try { +window.external.AddSearchProvider(prov); +} + +catch (e) { +alert("Search plugins require Firefox 2"); +return; +} +} + +function addEngine(name,ext,cat,pid) +{ + if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) { + window.sidebar.addSearchEngine( + "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src", + "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat ); + } else { + alert("You will need a browser which supports Sherlock to install this plugin."); + } +} + +function addOpenSearch(name,ext,cat,pid,meth) +{ + if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { + if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { + alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); + } else { + window.external.AddSearchProvider( + "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); + } + } else { + alert("You will need a browser which supports OpenSearch to install this plugin."); + } +} + +function addOpenSearch2(name,ext,cat,pid,meth) +{ + if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { + if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { + alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); + } else { + window.external.AddSearchProvider( + "http://torbutton.torproject.org/dev/search/" + name + ".xml"); + } + } else { + alert("You will need a browser which supports OpenSearch to install this plugin."); + } +} + +function install (aEvent) +{ + var params = { + "Torbutton": { URL: aEvent.target.href, + Hash: aEvent.target.getAttribute("hash"), + toString: function () { return this.URL; } + } + }; + InstallTrigger.install(params); + + return false; +} diff --git a/rule-41/banner.html b/rule-41/banner.html index 1c8372a..e356f3d 100644 --- a/rule-41/banner.html +++ b/rule-41/banner.html @@ -12,18 +12,9 @@ <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> <script type="text/javascript" src="js/easyXDM.min.js"></script> <script type='text/javascript' src="js/modernizr.min.js"></script> - <script type='text/javascript' src="js/css3-mediaqueries.js"></script> - <script type="text/javascript"> + <script type='text/javascript' src="js/css3-mediaqueries.js"></script> + <script type="text/javascript" src="js/animate.js"></script> - document.addEventListener("DOMContentLoaded", function(event) { - var animate = document.getElementById("animate"); - animate.classList.add("not-loaded"); - window.setTimeout(function () { - animate.classList.remove("not-loaded"); - animate.classList.add("loaded"); - }, 0); - }); - </script>  <!--[if lt IE 9]> <script type='text/javascript' src="js/html5.js"></script> @@ -71,8 +62,8 @@ <div class="mobile-banner visible-xs abs-centered"> <a href="https://NoGlobalWarrants.org" target="_blank"><img src="imgs/mobile_txt.png" class="img-responsive abs-centered" /></a> </div> - - <script type='text/javascript' src="js/main.js"></script> + + <script type='text/javascript' src="js/main.js"></script> </body> -</html> \ No newline at end of file +</html>

1 0

[webwml/master] Fix small error in js lib jquery.ba-bbq
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 4c62d8f0ab87d91b8b3bb56ed4e50d1d93da0af3 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 11:57:59 2017 +0200 Fix small error in js lib jquery.ba-bbq --- js/jquery.ba-bbq.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.ba-bbq.min.js b/js/jquery.ba-bbq.min.js index bcbf248..dbacde5 100644 --- a/js/jquery.ba-bbq.min.js +++ b/js/jquery.ba-bbq.min.js @@ -15,4 +15,4 @@ * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ -(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this); \ No newline at end of file +(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",var f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);

1 0

[webwml/master] Fix revert conflict
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 9d237a64690f6bdbac085bdab694c40069b060a6 Merge: 86c5276 4c62d8f Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 12:18:29 2017 +0200 Fix revert conflict js/jquery.ba-bbq.min.js | 1 + 1 file changed, 1 insertion(+) diff --cc js/jquery.ba-bbq.min.js index 88109c8,dbacde5..279989b --- a/js/jquery.ba-bbq.min.js +++ b/js/jquery.ba-bbq.min.js @@@ -15,4 -15,4 +15,5 @@@ * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ -(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",var f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this); ++ +(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);

1 0

[webwml/master] Fix small typo
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 8278e9f91694857cefb17964f2025e4272477e29 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 13:02:36 2017 +0200 Fix small typo --- js/dlpage01.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/dlpage01.js b/js/dlpage01.js index 9efe042..d1459e1 100644 --- a/js/dlpage01.js +++ b/js/dlpage01.js @@ -63,8 +63,8 @@ $(function(){ }); $(document).ready(function () { - $('.onload').ready(resetAll; - + $('.onload').ready(resetAll); + $('.jump').click(function(event){ //prevent the default action for the click event //event.preventDefault();

1 0

[webwml/master] Move jquery-migrate before ba-bbq
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit f52045ee66095f0160935cf7a2be72c85c394d92 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 12:48:05 2017 +0200 Move jquery-migrate before ba-bbq --- include/dlhead.wmi | 2 +- js/jquery.ba-bbq.min.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/dlhead.wmi b/include/dlhead.wmi index f3fed1e..87fc98b 100644 --- a/include/dlhead.wmi +++ b/include/dlhead.wmi @@ -43,10 +43,10 @@ Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug… License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug…) */ </script> + <script type="text/javascript" src="../js/jquery-migrate-1.0.0.js"></script> <script type="text/javascript" src="../js/jquery.ba-bbq.min.js"> /* Source: https://raw.github.com/cowboy/jquery-bbq/v1.2.1/jquery.ba-bbq.js */ </script> - <script type="text/javascript" src="../js/jquery-migrate-1.0.0.js"></script> <script type="text/javascript" src="../js/dlpage01.js"> # /* Displays detected section */ </script> diff --git a/js/jquery.ba-bbq.min.js b/js/jquery.ba-bbq.min.js index 279989b..88109c8 100644 --- a/js/jquery.ba-bbq.min.js +++ b/js/jquery.ba-bbq.min.js @@ -15,5 +15,4 @@ * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ - (function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);

1 0

[webwml/master] Add support for old jquery functions
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 86c5276a16346a5a6201c98cc61550ab60e3754f Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 11:57:59 2017 +0200 Add support for old jquery functions --- include/dlhead.wmi | 23 ++- js/jquery-migrate-1.0.0.js | 498 +++++++++++++++++++++++++++++++++++++++++++++ js/jquery.ba-bbq.min.js | 6 +- 3 files changed, 513 insertions(+), 14 deletions(-) diff --git a/include/dlhead.wmi b/include/dlhead.wmi index 779b374..f3fed1e 100644 --- a/include/dlhead.wmi +++ b/include/dlhead.wmi @@ -14,7 +14,7 @@ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - # begin WML to generate css/js paths + # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> @@ -30,7 +30,7 @@ <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths + # end WML to generate css/js paths <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="The Tor Project, Inc."> @@ -46,6 +46,7 @@ <script type="text/javascript" src="../js/jquery.ba-bbq.min.js"> /* Source: https://raw.github.com/cowboy/jquery-bbq/v1.2.1/jquery.ba-bbq.js */ </script> + <script type="text/javascript" src="../js/jquery-migrate-1.0.0.js"></script> <script type="text/javascript" src="../js/dlpage01.js"> # /* Displays detected section */ </script> @@ -84,9 +85,9 @@ my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory of active link, set class active + # in directory of active link, set class active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { $class = 'class="active"'; @@ -95,12 +96,12 @@ } $dir = '.' unless defined $dir; - + # translated version if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; - } + } # english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", @@ -129,14 +130,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), my $val = shift @calltoaction; push @keys, $key; $calltoaction{$key} = $val; - } + } my $page = $WML_SRC_BASENAME; my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory, set active + # in directory, set active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { #if ($WML_SRC_BASENAME eq $base) { @@ -150,7 +151,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } + } # default to english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", @@ -158,7 +159,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), } else { warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; } - } + } }:> </ul> </div> diff --git a/js/jquery-migrate-1.0.0.js b/js/jquery-migrate-1.0.0.js new file mode 100644 index 0000000..cc84234 --- /dev/null +++ b/js/jquery-migrate-1.0.0.js @@ -0,0 +1,498 @@ +/*! + * jQuery Migrate - v1.0.0 - 2013-01-14 + * https://github.com/jquery/jquery-migrate + * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT + */ +(function( jQuery, window, undefined ) { +"use strict"; + + +var warnedAbout = {}; + +// List of warnings already given; public read only +jQuery.migrateWarnings = []; + +// Set to true to prevent console output; migrateWarnings still maintained +// jQuery.migrateMute = false; + +// Forget any warnings we've already given; public +jQuery.migrateReset = function() { + warnedAbout = {}; + jQuery.migrateWarnings.length = 0; +}; + +function migrateWarn( msg) { + if ( !warnedAbout[ msg ] ) { + warnedAbout[ msg ] = true; + jQuery.migrateWarnings.push( msg ); + if ( window.console && console.warn && !jQuery.migrateMute ) { + console.warn( "JQMIGRATE: " + msg ); + } + } +} + +function migrateWarnProp( obj, prop, value, msg ) { + if ( Object.defineProperty ) { + // On ES5 browsers (non-oldIE), warn if the code tries to get prop; + // allow property to be overwritten in case some other plugin wants it + try { + Object.defineProperty( obj, prop, { + configurable: true, + enumerable: true, + get: function() { + migrateWarn( msg ); + return value; + }, + set: function( newValue ) { + migrateWarn( msg ); + value = newValue; + } + }); + return; + } catch( err ) { + // IE8 is a dope about Object.defineProperty, can't warn there + } + } + + // Non-ES5 (or broken) browser; just set the property + jQuery._definePropertyBroken = true; + obj[ prop ] = value; +} + +if ( document.compatMode === "BackCompat" ) { + // jQuery has never supported or tested Quirks Mode + migrateWarn( "jQuery is not compatible with Quirks Mode" ); +} + + +var attrFn = {}, + attr = jQuery.attr, + valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || + function() { return null; }, + valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set || + function() { return undefined; }, + rnoType = /^(?:input|button)$/i, + rnoAttrNodeType = /^[238]$/, + rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, + ruseDefault = /^(?:checked|selected)$/i; + +// jQuery.attrFn +migrateWarnProp( jQuery, "attrFn", attrFn, "jQuery.attrFn is deprecated" ); + +jQuery.attr = function( elem, name, value, pass ) { + var lowerName = name.toLowerCase(), + nType = elem && elem.nodeType; + + if ( pass ) { + migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); + if ( elem && !rnoAttrNodeType.test( nType ) && jQuery.isFunction( jQuery.fn[ name ] ) ) { + return jQuery( elem )[ name ]( value ); + } + } + + // Warn if user tries to set `type` since it breaks on IE 6/7/8 + if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) ) { + migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8"); + } + + // Restore boolHook for boolean property/attribute synchronization + if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) { + jQuery.attrHooks[ lowerName ] = { + get: function( elem, name ) { + // Align boolean attributes with corresponding properties + // Fall back to attribute presence where some booleans are not supported + var attrNode, + property = jQuery.prop( elem, name ); + return property === true || typeof property !== "boolean" && + ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? + + name.toLowerCase() : + undefined; + }, + set: function( elem, value, name ) { + var propName; + if ( value === false ) { + // Remove boolean attributes when set to false + jQuery.removeAttr( elem, name ); + } else { + // value is true since we know at this point it's type boolean and not false + // Set boolean attributes to the same name and set the DOM property + propName = jQuery.propFix[ name ] || name; + if ( propName in elem ) { + // Only set the IDL specifically if it already exists on the element + elem[ propName ] = true; + } + + elem.setAttribute( name, name.toLowerCase() ); + } + return name; + } + }; + + // Warn only for attributes that can remain distinct from their properties post-1.9 + if ( ruseDefault.test( lowerName ) ) { + migrateWarn( "jQuery.fn.attr(" + lowerName + ") may use property instead of attribute" ); + } + } + + return attr.call( jQuery, elem, name, value ); +}; + +// attrHooks: value +jQuery.attrHooks.value = { + get: function( elem, name ) { + var nodeName = ( elem.nodeName || "" ).toLowerCase(); + if ( nodeName === "button" ) { + return valueAttrGet.apply( this, arguments ); + } + if ( nodeName !== "input" && nodeName !== "option" ) { + migrateWarn("property-based jQuery.fn.attr('value') is deprecated"); + } + return name in elem ? + elem.value : + null; + }, + set: function( elem, value ) { + var nodeName = ( elem.nodeName || "" ).toLowerCase(); + if ( nodeName === "button" ) { + return valueAttrSet.apply( this, arguments ); + } + if ( nodeName !== "input" && nodeName !== "option" ) { + migrateWarn("property-based jQuery.fn.attr('value', val) is deprecated"); + } + // Does not return so that setAttribute is also used + elem.value = value; + } +}; + + +var matched, browser, + oldInit = jQuery.fn.init, + // Note this does NOT include the # XSS fix from 1.7! + rquickExpr = /^(?:.*(<[\w\W]+>)[^>]*|#([\w\-]*))$/; + +// $(html) "looks like html" rule change +jQuery.fn.init = function( selector, context, rootjQuery ) { + var match; + + if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) && + (match = rquickExpr.exec( selector )) && match[1] ) { + // This is an HTML string according to the "old" rules; is it still? + if ( selector.charAt( 0 ) !== "<" ) { + migrateWarn("$(html) HTML strings must start with '<' character"); + } + // Now process using loose rules; let pre-1.8 play too + if ( context && context.context ) { + // jQuery object as context; parseHTML expects a DOM object + context = context.context; + } + if ( jQuery.parseHTML ) { + return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ), + context, rootjQuery ); + } + } + return oldInit.apply( this, arguments ); +}; +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + +matched = jQuery.uaMatch( navigator.userAgent ); +browser = {}; + +if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; +} + +// Chrome is Webkit, but Webkit is also Safari. +if ( browser.chrome ) { + browser.webkit = true; +} else if ( browser.webkit ) { + browser.safari = true; +} + +jQuery.browser = browser; + +// Warn if the code tries to get jQuery.browser +migrateWarnProp( jQuery, "browser", browser, "jQuery.browser is deprecated" ); + +jQuery.sub = function() { + function jQuerySub( selector, context ) { + return new jQuerySub.fn.init( selector, context ); + } + jQuery.extend( true, jQuerySub, this ); + jQuerySub.superclass = this; + jQuerySub.fn = jQuerySub.prototype = this(); + jQuerySub.fn.constructor = jQuerySub; + jQuerySub.sub = this.sub; + jQuerySub.fn.init = function init( selector, context ) { + if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { + context = jQuerySub( context ); + } + + return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); + }; + jQuerySub.fn.init.prototype = jQuerySub.fn; + var rootjQuerySub = jQuerySub(document); + migrateWarn( "jQuery.sub() is deprecated" ); + return jQuerySub; +}; + + +var oldFnData = jQuery.fn.data; + +jQuery.fn.data = function( name ) { + var ret, evt, + elem = this[0]; + + // Handles 1.7 which has this behavior and 1.8 which doesn't + if ( elem && name === "events" && arguments.length === 1 ) { + ret = jQuery.data( elem, name ); + evt = jQuery._data( elem, name ); + if ( ( ret === undefined || ret === evt ) && evt !== undefined ) { + migrateWarn("Use of jQuery.fn.data('events') is deprecated"); + return evt; + } + } + return oldFnData.apply( this, arguments ); +}; + + +var rscriptType = /\/(java|ecma)script/i, + oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack, + oldFragment = jQuery.buildFragment; + +jQuery.fn.andSelf = function() { + migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"); + return oldSelf.apply( this, arguments ); +}; + +// Since jQuery.clean is used internally on older versions, we only shim if it's missing +if ( !jQuery.clean ) { + jQuery.clean = function( elems, context, fragment, scripts ) { + // Set context per 1.8 logic + context = context || document; + context = !context.nodeType && context[0] || context; + context = context.ownerDocument || context; + + migrateWarn("jQuery.clean() is deprecated"); + + var i, elem, handleScript, jsTags, + ret = []; + + jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes ); + + // Complex logic lifted directly from jQuery 1.8 + if ( fragment ) { + // Special handling of each script element + handleScript = function( elem ) { + // Check if we consider it executable + if ( !elem.type || rscriptType.test( elem.type ) ) { + // Detach the script and store it in the scripts array (if provided) or the fragment + // Return truthy to indicate that it has been handled + return scripts ? + scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) : + fragment.appendChild( elem ); + } + }; + + for ( i = 0; (elem = ret[i]) != null; i++ ) { + // Check if we're done after handling an executable script + if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) { + // Append to fragment and handle embedded scripts + fragment.appendChild( elem ); + if ( typeof elem.getElementsByTagName !== "undefined" ) { + // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration + jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript ); + + // Splice the scripts into ret after their former ancestor and advance our index beyond them + ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) ); + i += jsTags.length; + } + } + } + } + + return ret; + }; +} + +jQuery.buildFragment = function( elems, context, scripts, selection ) { + var ret, + warning = "jQuery.buildFragment() is deprecated"; + + // Set context per 1.8 logic + context = context || document; + context = !context.nodeType && context[0] || context; + context = context.ownerDocument || context; + + try { + ret = oldFragment.call( jQuery, elems, context, scripts, selection ); + + // jQuery < 1.8 required arrayish context; jQuery 1.9 fails on it + } catch( x ) { + ret = oldFragment.call( jQuery, elems, context.nodeType ? [ context ] : context[ 0 ], scripts, selection ); + + // Success from tweaking context means buildFragment was called by the user + migrateWarn( warning ); + } + + // jQuery < 1.9 returned an object instead of the fragment itself + if ( !ret.fragment ) { + migrateWarnProp( ret, "fragment", ret, warning ); + migrateWarnProp( ret, "cacheable", false, warning ); + } + + return ret; +}; + +var eventAdd = jQuery.event.add, + eventRemove = jQuery.event.remove, + eventTrigger = jQuery.event.trigger, + oldToggle = jQuery.fn.toggle, + oldLive = jQuery.fn.live, + oldDie = jQuery.fn.die, + ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess", + rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ), + rhoverHack = /(?:^|\s)hover(\.\S+|)\b/, + hoverHack = function( events ) { + if ( typeof( events ) != "string" || jQuery.event.special.hover ) { + return events; + } + if ( rhoverHack.test( events ) ) { + migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"); + } + return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); + }; + +// Event props removed in 1.9, put them back if needed; no practical way to warn them +if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) { + jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" ); +} + +// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7 +migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" ); + +// Support for 'hover' pseudo-event and ajax event warnings +jQuery.event.add = function( elem, types, handler, data, selector ){ + if ( elem !== document && rajaxEvent.test( types ) ) { + migrateWarn( "AJAX events should be attached to document: " + types ); + } + eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector ); +}; +jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){ + eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes ); +}; + +jQuery.fn.error = function() { + var args = Array.prototype.slice.call( arguments, 0); + migrateWarn("jQuery.fn.error() is deprecated"); + args.splice( 0, 0, "error" ); + if ( arguments.length ) { + return this.bind.apply( this, args ); + } + // error event should not bubble to window, although it does pre-1.7 + this.triggerHandler.apply( this, args ); + return this; +}; + +jQuery.fn.toggle = function( fn, fn2 ) { + + // Don't mess with animation or css toggles + if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) { + return oldToggle.apply( this, arguments ); + } + migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated"); + + // Save reference to arguments for access in closure + var args = arguments, + guid = fn.guid || jQuery.guid++, + i = 0, + toggler = function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + }; + + // link all the functions, so any of them can unbind this click handler + toggler.guid = guid; + while ( i < args.length ) { + args[ i++ ].guid = guid; + } + + return this.click( toggler ); +}; + +jQuery.fn.live = function( types, data, fn ) { + migrateWarn("jQuery.fn.live() is deprecated"); + if ( oldLive ) { + return oldLive.apply( this, arguments ); + } + jQuery( this.context ).on( types, this.selector, data, fn ); + return this; +}; + +jQuery.fn.die = function( types, fn ) { + migrateWarn("jQuery.fn.die() is deprecated"); + if ( oldDie ) { + return oldDie.apply( this, arguments ); + } + jQuery( this.context ).off( types, this.selector || "**", fn ); + return this; +}; + +// Turn global events into document-triggered events +jQuery.event.trigger = function( event, data, elem, onlyHandlers ){ + if ( !elem & !rajaxEvent.test( event ) ) { + migrateWarn( "Global events are undocumented and deprecated" ); + } + return eventTrigger.call( this, event, data, elem || document, onlyHandlers ); +}; +jQuery.each( ajaxEvents.split("|"), + function( _, name ) { + jQuery.event.special[ name ] = { + setup: function() { + var elem = this; + + // The document needs no shimming; must be !== for oldIE + if ( elem !== document ) { + jQuery.event.add( document, name + "." + jQuery.guid, function() { + jQuery.event.trigger( name, null, elem, true ); + }); + jQuery._data( this, name, jQuery.guid++ ); + } + return false; + }, + teardown: function() { + if ( this !== document ) { + jQuery.event.remove( document, name + "." + jQuery._data( this, name ) ); + } + return false; + } + }; + } +); + + +})( jQuery, window ); diff --git a/js/jquery.ba-bbq.min.js b/js/jquery.ba-bbq.min.js index bcbf248..88109c8 100644 --- a/js/jquery.ba-bbq.min.js +++ b/js/jquery.ba-bbq.min.js @@ -1,7 +1,7 @@ /* * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010 * http://benalman.com/projects/jquery-bbq-plugin/ - * + * * Copyright (c) 2010 "Cowboy" Ben Alman * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ @@ -10,9 +10,9 @@ /* * jQuery hashchange event - v1.2 - 2/11/2010 * http://benalman.com/projects/jquery-hashchange-plugin/ - * + * * Copyright (c) 2010 "Cowboy" Ben Alman * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ */ -(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this); \ No newline at end of file +(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);

1 0

[webwml/master] Fix src unsafe error
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 42b034e7e47da92bd2852b63376a4d9c394f1e72 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 12:58:39 2017 +0200 Fix src unsafe error --- include/dlhead.wmi | 2 +- js/dlpage01.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/dlhead.wmi b/include/dlhead.wmi index 87fc98b..d600ee8 100644 --- a/include/dlhead.wmi +++ b/include/dlhead.wmi @@ -56,7 +56,7 @@ License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ </script> </head> -<body onload="resetAll()" onunload=""> +<body class="onload"> <span class="hidden" id="version-data"> { "torbrowserbundledir" : "<version-torbrowserbundledir>", "torbrowserbundle" : "<version-torbrowserbundle>", diff --git a/js/dlpage01.js b/js/dlpage01.js index ddbd519..9efe042 100644 --- a/js/dlpage01.js +++ b/js/dlpage01.js @@ -63,7 +63,8 @@ $(function(){ }); $(document).ready(function () { - + $('.onload').ready(resetAll; + $('.jump').click(function(event){ //prevent the default action for the click event //event.preventDefault(); @@ -83,7 +84,7 @@ $(document).ready(function () { // $('html, body').animate({scrollTop:target_top}, 1000); }); - + // Bind an event to window.onhashchange $(window).bind( 'hashchange', function(e) { @@ -95,7 +96,7 @@ $(document).ready(function () { $('.easy').css('display', 'none'); } - + if(url == 'windows'){ $('.easy.windows').css('display', 'block'); } else if(url == 'mac'){ @@ -109,7 +110,7 @@ $(document).ready(function () { $(function(){OScheck();}); } }); - + // Since the event is only triggered when the hash changes, we need to trigger // the event now, to handle the hash the page may have loaded with. $(window).trigger( 'hashchange' );

1 0

[webwml/staging] Fix small typo
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 8278e9f91694857cefb17964f2025e4272477e29 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 13:02:36 2017 +0200 Fix small typo --- js/dlpage01.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/dlpage01.js b/js/dlpage01.js index 9efe042..d1459e1 100644 --- a/js/dlpage01.js +++ b/js/dlpage01.js @@ -63,8 +63,8 @@ $(function(){ }); $(document).ready(function () { - $('.onload').ready(resetAll; - + $('.onload').ready(resetAll); + $('.jump').click(function(event){ //prevent the default action for the click event //event.preventDefault();

1 0