Upgrade to use/expect jQuery 3.1.1

larspetrus · Mar 10, 2017 · c9e0d8b · c9e0d8b
1 parent 7aa201b
commit c9e0d8b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -5,10 +5,10 @@ Roofpig is an animated, programmable and interactive Rubik's Cube for the modern
 It should work on most [any modern browser](http://caniuse.com/canvas).
 
 ##1. Usage
-All you need is one file and a web server. Put [`roofpig_and_three.min.js`](https://raw.githubusercontent.com/larspetrus/Roofpig/master/roofpig_and_three.min.js) on your server. Include it, and jQuery 1.11.3 in your HTML:
+All you need is one file and a web server. Put [`roofpig_and_three.min.js`](https://raw.githubusercontent.com/larspetrus/Roofpig/master/roofpig_and_three.min.js) on your server. Include it, and jQuery 3.1.1 in your HTML:
 
 ```html
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
 <script src="roofpig_and_three.min.js"></script>
 ```
 #####Static creation
@@ -42,7 +42,7 @@ Valid properties are: `alg`, `algdisplay`, `base`, `colored`, `colors`, `flags`,
 Define the animated algorithm like this: `alg=R F' x2 R D Lw'`. It handles standard cube notation and some more. If no alg is given, the playback buttons don't appear.
 
 #####Standard notation
-Roofpig supports (almost) all standard cube notation. Layer(s): **F, B, R, L, U, D. M, E, S. x, y, z. Fw, Bw, Rw, Lw, Uw, Dw**. Turns: **2, ', 2'**. You can also use **², Z, 1** and **3**.
+Roofpig supports (almost) all standard cube notation. Layer(s): **F, B, R, L, U, D. M, E, S. x, y, z. Fw, Bw, Rw, Lw, Uw, Dw, f, b, r, l, u, d**. Turns: **2, ', 2'**. You can also use **², Z, 1** and **3**.
 
 
 #####Rotation notation

diff --git a/lib/jquery-1.11.3.min.js b/lib/jquery-1.11.3.min.js
diff --git a/lib/jquery-3.1.1.min.js b/lib/jquery-3.1.1.min.js
diff --git a/misc/demo.html b/misc/demo.html
@@ -44,7 +44,7 @@ <h3>Official release version</h3>
   </table>
 </div>
 
-<script src="../lib/jquery-1.11.3.min.js"></script>
+<script src="../lib/jquery-3.1.1.min.js"></script>
 <script src="../roofpig_and_three.min.js"></script>
 
 </body>
diff --git a/misc/demo_local.html b/misc/demo_local.html
@@ -44,7 +44,7 @@ <h3>Local build version</h3>
   </table>
 </div>
 
-<script src="../lib/jquery-1.11.3.min.js"></script>
+<script src="../lib/jquery-3.1.1.min.js"></script>
 <script src="../local/build/roofpig_and_three.min.js"></script>
 
 </body>
diff --git a/misc/rptest_template.html b/misc/rptest_template.html
@@ -7,7 +7,7 @@
 <body>
 <div id="mocha"></div>
 
-<script src="lib/jquery-1.11.3.min.js"></script>
+<script src="lib/jquery-3.1.1.min.js"></script>
 <script src="https://cdn.rawgit.com/chaijs/chai/2.3.0/chai.js"></script>
 <script src="https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js"></script>
 

diff --git a/src/Dom.coffee b/src/Dom.coffee
@@ -104,10 +104,10 @@ class Dom
   _show: (button, enabled) ->
     button.show()
     if enabled
-      button.removeAttr("disabled")
+      button.prop("disabled", false)
       button.addClass('roofpig-button-enabled')
     else
-      button.attr("disabled", "disabled")
+      button.prop("disabled", true)
       button.removeClass('roofpig-button-enabled')
 
   _make_button: (text, name) ->

diff --git a/src/document.coffee b/src/document.coffee
@@ -1,14 +1,14 @@
 #= require Css
 
 $(document).ready ->
-  console.log("Roofpig version 1.3.☂ (@@BUILT_WHEN@@). Expecting jQuery 1.11.3 and Three.js 71.")
+  console.log("Roofpig version 1.4 (WIP).☂ (@@BUILT_WHEN@@). Expecting jQuery 3.1.1 and Three.js 71.")
   console.log("jQuery version", $.fn.jquery)
 
   $('head').append(Css.CODE)
 
   CubeAnimation.initialize()
 
   pigs = $('.roofpig')
-  console.log("Found #{pigs.size()} .roofpig divs")
+  console.log("Found #{pigs.length} .roofpig divs")
   for roofpig_div in pigs
     new CubeAnimation($(roofpig_div))
diff --git a/test/CubeAnimation_spec.coffee b/test/CubeAnimation_spec.coffee
@@ -1,5 +1,5 @@
 #= require three.min
-#= require jquery-1.11.3.min.js
+#= require jquery-3.1.1.min.js
 #= require Camera
 #= require CubeAnimation
 #= require EventHandlers