Move scripts to their own js file
hiromipaw

hiromipaw commited on 2017-06-16 11:16:38
Zeige 6 geänderte Dateien mit 77 Einfügungen und 86 Löschungen.

... ...
@@ -14,74 +14,7 @@
14 14
     <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
15 15
     <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/>
16 16
     <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
17
-    <script type="text/javascript">
18
-    
19
-    function addSearchProvider(prov) {
20
-    
21
-    try {
22
-    window.external.AddSearchProvider(prov);
23
-    }
24
-    
25
-    catch (e) {
26
-    alert("Search plugins require Firefox 2");
27
-    return;
28
-    }
29
-    }
30
-    
31
-    function addEngine(name,ext,cat,pid)
32
-    {
33
-      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
34
-        window.sidebar.addSearchEngine(
35
-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",
36
-          "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );
37
-      } else {
38
-        alert("You will need a browser which supports Sherlock to install this plugin.");
39
-      }
40
-    }
41
-    
42
-    function addOpenSearch(name,ext,cat,pid,meth)
43
-    {
44
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
45
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
46
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
47
-        } else {
48
-          window.external.AddSearchProvider(
49
-            "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");
50
-        }
51
-      } else {
52
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
53
-      }
54
-    }
55
-    
56
-    function addOpenSearch2(name,ext,cat,pid,meth)
57
-    {
58
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
59
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
60
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
61
-        } else {
62
-          window.external.AddSearchProvider(
63
-            "http://torbutton.torproject.org/dev/search/" + name + ".xml");
64
-        }
65
-      } else {
66
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
67
-      }
68
-    }
69
-    
70
-    function install (aEvent)
71
-    {
72
-      var params = {
73
-        "Torbutton": { URL: aEvent.target.href,
74
-                 Hash: aEvent.target.getAttribute("hash"),
75
-                 toString: function () { return this.URL; }
76
-        }
77
-      };
78
-      InstallTrigger.install(params);
79
-    
80
-      return false;
81
-    }
82
-    
83
-    
84
-    </script>
17
+    <script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script>
85 18
 
86 19
     <h2>Torbutton</h2>
87 20
     <hr>
... ...
@@ -65,10 +65,7 @@
65 65
                 browse the Internet.</p>
66 66
                 </div>
67 67
               </td>
68
-              <td>
69
-                <div class="project">
70
-                <a href="https://guardianproject.info/apps/orbot/"><img
71
-                src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a>
68
+              <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.">
72 69
                 <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
73 70
                 <p>Tor for Google Android devices.</p>
74 71
                 </div>
... ...
@@ -36,10 +36,7 @@
36 36
   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
37 37
 <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script>
38 38
 <script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script>
39
-<script type="text/javascript" charset="utf-8">
40
-/* email placeholder function */
41
-	$(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); });
42
-</script>
39
+<script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script>
43 40
 </head>
44 41
 <body>
45 42
 <div id="wrap">
... ...
@@ -0,0 +1,8 @@
1
+document.addEventListener("DOMContentLoaded", function(event) {
2
+ var animate = document.getElementById("animate");
3
+ animate.classList.add("not-loaded");
4
+  window.setTimeout(function () {
5
+    animate.classList.remove("not-loaded");
6
+    animate.classList.add("loaded");
7
+  }, 0);
8
+});
... ...
@@ -0,0 +1,65 @@
1
+$(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); });
2
+
3
+function addSearchProvider(prov) {
4
+
5
+try {
6
+window.external.AddSearchProvider(prov);
7
+}
8
+
9
+catch (e) {
10
+alert("Search plugins require Firefox 2");
11
+return;
12
+}
13
+}
14
+
15
+function addEngine(name,ext,cat,pid)
16
+{
17
+  if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
18
+    window.sidebar.addSearchEngine(
19
+      "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src",
20
+      "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat );
21
+  } else {
22
+    alert("You will need a browser which supports Sherlock to install this plugin.");
23
+  }
24
+}
25
+
26
+function addOpenSearch(name,ext,cat,pid,meth)
27
+{
28
+  if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
29
+    if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
30
+      alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
31
+    } else {
32
+      window.external.AddSearchProvider(
33
+        "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml");
34
+    }
35
+  } else {
36
+    alert("You will need a browser which supports OpenSearch to install this plugin.");
37
+  }
38
+}
39
+
40
+function addOpenSearch2(name,ext,cat,pid,meth)
41
+{
42
+  if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
43
+    if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
44
+      alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
45
+    } else {
46
+      window.external.AddSearchProvider(
47
+        "http://torbutton.torproject.org/dev/search/" + name + ".xml");
48
+    }
49
+  } else {
50
+    alert("You will need a browser which supports OpenSearch to install this plugin.");
51
+  }
52
+}
53
+
54
+function install (aEvent)
55
+{
56
+  var params = {
57
+    "Torbutton": { URL: aEvent.target.href,
58
+             Hash: aEvent.target.getAttribute("hash"),
59
+             toString: function () { return this.URL; }
60
+    }
61
+  };
62
+  InstallTrigger.install(params);
63
+
64
+  return false;
65
+}
... ...
@@ -13,17 +13,8 @@
13 13
     <script type="text/javascript" src="js/easyXDM.min.js"></script>
14 14
     <script type='text/javascript' src="js/modernizr.min.js"></script>
15 15
     <script type='text/javascript' src="js/css3-mediaqueries.js"></script>
16
-     <script type="text/javascript">
16
+    <script type="text/javascript" src="js/animate.js"></script>
17 17
 
18
-      document.addEventListener("DOMContentLoaded", function(event) {
19
-       var animate = document.getElementById("animate");
20
-       animate.classList.add("not-loaded");
21
-        window.setTimeout(function () {
22
-          animate.classList.remove("not-loaded");
23
-          animate.classList.add("loaded");
24
-        }, 0);
25
-      });
26
-    </script>
27 18
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
28 19
     <!--[if lt IE 9]>
29 20
       <script type='text/javascript' src="js/html5.js"></script>
30 21