remove duplicate file and update path to jquery file

aeb8119c · Gabriel Monnerat · ad4bf5b4 · aeb8119c · ad4bf5b4 · aeb8119c
Commit aeb8119c authored Oct 14, 2011 by Gabriel Monnerat
7 changed files
--- a/UNGProject/js/jquery/plugin/svg-editor/svg-editor.html
+++ b/UNGProject/js/jquery/plugin/svg-editor/svg-editor.html
@@ -12,7 +12,7 @@

 <!-- Release version of script tags: -->

-<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.js"></script>
 <script type="text/javascript" src="hotkeys/jquery.hotkeys.min.js"></script>
 <script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script>
 <script type="text/javascript" src="svgicons/jquery.svgicons.min.js"></script>
@@ -617,4 +617,4 @@
 	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/UNGProject/svg-edit/jquery.js
+++ b/UNGProject/svg-edit/jquery.js
--- a/UNGProject/svg-edit/svg-editor.html
+++ b/UNGProject/svg-edit/svg-editor.html
@@ -12,7 +12,7 @@

 <!-- Release version of script tags: -->

-<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.js"></script>
 <script type="text/javascript" src="hotkeys/jquery.hotkeys.min.js"></script>
 <script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script>
 <script type="text/javascript" src="svgicons/jquery.svgicons.min.js"></script>
@@ -618,4 +618,4 @@
 	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/UNGProject/unhosted/jio.js
+++ b/UNGProject/unhosted/jio.js
@@ -9,7 +9,7 @@
     */
    var dependenceLoaded = includeJS([//files to load
        "unhosted/sjcl.js",
-        "unhosted/jquery.js",
+        "js/jquery/jquery.js",
        "unhosted/base64.js"
    ],function() {// return true only if dependencies are loaded
        return (window.$ && window.sjcl && window.Base64) // check jQuery, sjcl & Base64
@@ -968,7 +968,7 @@
     * @param ready : (optional) array of elements allowing to know if dependencies are ready
     * @param instruction : (optional) instruction to execute when dependencies are loaded
     * @return the ready function
-     * @example : includeJS("jquery.js",[$]);
+     * @example : includeJS("js/jquery/jquery.js",[$]);
     */
    function includeJS(url,ready, instruction) {
        //path = findURL("jio.js");

--- a/UNGProject/unhosted/jquery.js
+++ b/UNGProject/unhosted/jquery.js
--- a/UNGProject/unhosted/login.html
+++ b/UNGProject/unhosted/login.html
@@ -3,7 +3,7 @@
  <head>
    <title></title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.js"></script>

    <script type="text/javascript">
        function getParameters() {

--- a/UNGProject/unhosted/register.html
+++ b/UNGProject/unhosted/register.html
@@ -3,7 +3,7 @@
  <head>
    <title></title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.js"></script>
    <script type="text/javascript">
        function register() {
            //remember the user
@@ -58,4 +58,4 @@
          </div>
      </form>
  </body>
-</html>
\ No newline at end of file
+</html>