2.x-bug-fixes

brewster1134 · Jun 14, 2016 · e1b25eb · e1b25eb
1 parent 4947189
commit e1b25eb
Show file tree

Hide file tree

Showing 10 changed files with 416 additions and 289 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 #### CHANGE LOG
 
+###### 2.0.2
+* code refactor
+* added tests
+
 ###### 2.0.1
 * viewport sizing bugfix
 

diff --git a/Newfile b/Newfile
@@ -2,7 +2,7 @@
 sources:
   default: ~/Code/ruby/new-tasks
 name: Tiler
-version: 2.0.1
+version: 2.0.2
 tasks:
   changelog:
   git:

diff --git a/bower.json b/bower.json
@@ -5,8 +5,10 @@
     "jquery-ui": "latest"
   },
   "devDependencies": {
-    "chai": "latest",
     "chai-as-promised": "latest",
+    "chai-jquery": "latest",
+    "chai": "latest",
+    "lolex": "sinonjs/lolex",
     "mocha": "latest",
     "sinon-chai": "latest",
     "sinon": "latest"

diff --git a/demo/tiler_demo.coffee b/demo/tiler_demo.coffee
@@ -2,16 +2,16 @@ $ ->
 
   # initalize tiler
   $('.tiler-viewport').each ->
-    $(@).tiler().tiler('goTo', 1, false)
+    $(@).tiler()
 
   # set the button text to match the tile title
   $('button[data-tiler-link]').each ->
-    $(@).text($(@).data('tiler-title'))
+    $(@).text $(@).data('tiler-title')
 
   # go to a tile on click based on the link id
   $('button').click ->
     tileId = $(@).data('tiler-link')
-    $(@).closest('.tiler-viewport').tiler('goTo', tileId)
+    $(@).closest('.tiler-viewport').tiler 'goTo', tileId
 
   # event to set background
   $('#background').on 'tiler.goto', (e, data) ->

diff --git a/demo/tiler_demo.js b/demo/tiler_demo.js
diff --git a/lib/tiler.js b/lib/tiler.js
diff --git a/spec/index.html b/spec/index.html
@@ -10,38 +10,73 @@
 
     <!-- initialize -->
     <div class="tiler-viewport" id="initialize">
-      <div class="tiler-tile">
+      <div class="tiler-tile" id="tile-initialize-1" data-tiler-animation="tile-initialize-1-animation" data-tiler-title="Tile Initialize 1 Title">
+
+        <!-- nested tiler instance -->
         <div class="tiler-viewport" id="initialize-nested">
-          <div class="tiler-tile"></div>
+          <div class="tiler-tile" id="tile-initialize-nested-1"></div>
         </div>
       </div>
-    </div>
-    <div class="tiler-viewport" id="viewport-height">
-      <div class="tiler-tile"></div>
-    </div>
 
-    <!-- initialize : buildLinks-->
-    <button data-tiler-link="build-links:tile-1"></button>
-    <div class="tiler-viewport" id="build-links">
-      <div class="tiler-tile" id="tile-1" data-tiler-title="Tile 1" data-tiler-foo="Foo 1"></div>
+      <!-- link tile -->
+      <div class="tiler-tile" id="tile-initialize-2" data-tiler-animation="tile-initialize-2-animation" data-tiler-title="Tile Initialize 2 Title"></div>
     </div>
 
-    <!-- initialize : options : isReversible -->
-    <div class="tiler-viewport" id="reverse-support">
-      <div class="tiler-tile" id="tile-1"></div>
-      <div class="tiler-tile" id="tile-2"></div>
+    <!-- link element -->
+    <button data-tiler-link="initialize:tile-initialize-2"></button>
+
+    <!-- option: activeTile -->
+    <div class="tiler-viewport" id="active-tile">
+      <div class="tiler-tile" id="tile-active-tile-1"></div>
+      <div class="tiler-tile" id="tile-active-tile-2"></div>
     </div>
 
     <!-- goTo -->
     <div class="tiler-viewport" id="go-to">
-      <div class="tiler-tile" id="tile-1"></div>
-      <div class="tiler-tile" id="tile-2"></div>
+      <div class="tiler-tile" id="tile-go-to-1" data-tiler-animation="tile-go-to-animation-1"></div>
+      <div class="tiler-tile" id="tile-go-to-2" data-tiler-animation="tile-go-to-animation-2"></div>
+    </div>
+
+    <!-- goTo: current tile -->
+    <div class="tiler-viewport" id="current-tile">
+      <div class="tiler-tile" id="tile-current-tile-1"></div>
+      <div class="tiler-tile" id="tile-current-tile-2"></div>
+    </div>
+
+    <!-- goTo: events -->
+    <div class="tiler-viewport" id="events">
+      <div class="tiler-tile" id="tile-events-1"></div>
+      <div class="tiler-tile" id="tile-events-2"></div>
+    </div>
+
+    <!-- goTo: option: isReversible -->
+    <div class="tiler-viewport" id="is-reversible">
+      <div class="tiler-tile" id="tile-is-reversible-1"></div>
+      <div class="tiler-tile" id="tile-is-reversible-2"></div>
+    </div>
+
+    <!-- goTo: custom animation -->
+    <div class="tiler-viewport" id="custom-animation">
+      <div class="tiler-tile" id="tile-custom-animation-1"></div>
+      <div class="tiler-tile" id="tile-custom-animation-2"></div>
+    </div>
+
+    <!-- goTo: animation true or undefined -->
+    <div class="tiler-viewport" id="animation-true-or-undefined">
+      <div class="tiler-tile" id="tile-animation-true-or-undefined-1" data-tiler-animation="tile-animation-true-or-undefined-animation-1"></div>
+      <div class="tiler-tile" id="tile-animation-true-or-undefined-2" data-tiler-animation="tile-animation-true-or-undefined-animation-2"></div>
+    </div>
+
+    <!-- goTo: animation false -->
+    <div class="tiler-viewport" id="animation-false">
+      <div class="tiler-tile" id="tile-animation-false-1"></div>
+      <div class="tiler-tile" id="tile-animation-false-2"></div>
     </div>
 
     <!-- refresh -->
     <div class="tiler-viewport" id="refresh">
-      <div class="tiler-tile" id="tile-1"></div>
-      <div class="tiler-tile" id="tile-2"></div>
+      <div class="tiler-tile" id="tile-refresh-1"></div>
+      <div class="tiler-tile" id="tile-refresh-2"></div>
     </div>
 
   </body>
@@ -52,26 +87,16 @@
   <script type="text/javascript" src="/vendor/jquery-ui/ui/widget.js"></script>
   <script type="text/javascript" src="/vendor/mocha/mocha.js"></script>
   <script type="text/javascript" src="/vendor/chai/chai.js"></script>
+  <script type="text/javascript" src="/vendor/chai-jquery/chai-jquery.js"></script>
 
   <!-- Sinon -->
+  <script type="text/javascript" src="/vendor/lolex/lolex.js"></script>
   <script type="text/javascript" src="/vendor/sinon/lib/sinon.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/util/core.js"></script>
+  <script type="text/javascript" src="/vendor/sinon/lib/sinon/call.js"></script>
   <script type="text/javascript" src="/vendor/sinon/lib/sinon/extend.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/typeOf.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/times_in_words.js"></script>
   <script type="text/javascript" src="/vendor/sinon/lib/sinon/spy.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/call.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/behavior.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/stub.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/mock.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/collection.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/assert.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/sandbox.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/test.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/test_case.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/match.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/format.js"></script>
-  <script type="text/javascript" src="/vendor/sinon/lib/sinon/log_error.js"></script>
+  <script type="text/javascript" src="/vendor/sinon/lib/sinon/util/core.js"></script>
+  <script type="text/javascript" src="/vendor/sinon/lib/sinon/util/fake_timers.js"></script>
 
   <script type="text/javascript" src="/vendor/sinon-chai/lib/sinon-chai.js"></script>
   <script type="text/javascript" src="/testem.js"></script>