Move jquery to lib, and added check on level

phtrivier · Aug 6, 2010 · a73a436 · a73a436
1 parent 1ee3095
commit a73a436
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/src/html/chapter1.html b/src/html/chapter1.html
@@ -9,8 +9,8 @@
 
     <!-- I wish I could reduce all this to a single file, hence
 	 reducing the chances of forgetting something ... -->
-    <script type="text/javascript" src="../js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="../js/jquery.url.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery-1.4.2.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery.url.min.js"></script>
     <script type="text/javascript" src="../js/move.js"></script>
     <script type="text/javascript" src="../js/puzzles.js"></script>
     <script type="text/javascript" src="../js/i18n.js"></script>

diff --git a/src/html/in-game.html b/src/html/in-game.html
@@ -8,9 +8,9 @@
     <link rel="icon" type="image/png" sizes="32x32" href="../../data/images/png/player.png" />
   </head>
   <body>
-    <script type="text/javascript" charset="UTF-8" src="../js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="../js/jquery.url.min.js"></script>
-    <script type="text/javascript" charset="UTF-8" src="../js/jquery-ui-1.8.2.custom.min.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="../js/lib/jquery-1.4.2.min.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="../js/lib/jquery.url.min.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="../js/lib/jquery-ui-1.8.2.custom.min.js"></script>
     <!-- TODO : compress all files into a big one, zip it, and hope for the
 	 best ... maybe using -->
     <script type="text/javascript" charset="UTF-8" src="../js/node.js"></script>

diff --git a/src/html/jsube.html b/src/html/jsube.html
@@ -7,8 +7,8 @@
   </head>
   <body>
 
-    <script type="text/javascript" src="../js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="../js/jquery.url.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery-1.4.2.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery.url.min.js"></script>
     <script type="text/javascript" src="../js/i18n.js"></script>
     <script type="text/javascript" src="../js/chapters.js"></script>
 

diff --git a/src/html/tutorial.html b/src/html/tutorial.html
@@ -9,8 +9,8 @@
 
     <!-- I wish I could reduce all this to a single file, hence
 	 reducing the chances of forgetting something ... -->
-    <script type="text/javascript" src="../js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="../js/jquery.url.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery-1.4.2.min.js"></script>
+    <script type="text/javascript" src="../js/lib/jquery.url.min.js"></script>
     <script type="text/javascript" src="../js/move.js"></script>
     <script type="text/javascript" src="../js/puzzles.js"></script>
     <script type="text/javascript" src="../js/i18n.js"></script>

diff --git a/src/js/jsube.js b/src/js/jsube.js
@@ -142,6 +142,11 @@ $(document).ready(function(){
 
     g_puzzle = load_puzzle();
 
+    if (g_puzzle == null) {
+	alert("Unable to load puzzle, sorry");
+	window.location = "jsube.html";
+    }
+
     $("a.transition").click(function (event) {
 	event.preventDefault();
 	linkLocation = this.href;

diff --git a/src/js/jquery-1.4.2.min.js → src/js/lib/jquery-1.4.2.min.js b/src/js/jquery-1.4.2.min.js → src/js/lib/jquery-1.4.2.min.js
diff --git a/src/js/jquery-ui-1.8.2.custom.min.js → src/js/lib/jquery-ui-1.8.2.custom.min.js b/src/js/jquery-ui-1.8.2.custom.min.js → src/js/lib/jquery-ui-1.8.2.custom.min.js
diff --git a/src/js/jquery.url.min.js → src/js/lib/jquery.url.min.js b/src/js/jquery.url.min.js → src/js/lib/jquery.url.min.js
diff --git a/src/js/puzzle.js b/src/js/puzzle.js
@@ -21,8 +21,12 @@ Puzzle.prototype.load_puzzle_structure = function (structure) {
 };
 
 Puzzle.prototype.load_messages = function (structure) {
-    this.on_start_messages = structure.on_start;
-    this.on_end_messages = structure.on_end;
+    if (structure.on_start) {
+	this.on_start_messages = structure.on_start;
+    }
+    if (structure.on_end) {
+	this.on_end_messages = structure.on_end;
+    }
     this.titles = structure.title;
 };