tiler viewport bug fix

brewster1134 · May 26, 2016 · 9260233 · 9260233
1 parent 83a992f
commit 9260233
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 #### CHANGE LOG
 
+###### 2.0.1
+* viewport sizing bugfix
+
 ###### 2.0.0
 * new css api (now requires reverse class css for optional reverse support)
 * optimized animations

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

diff --git a/demo/tiler_demo.css b/demo/tiler_demo.css
@@ -16,7 +16,7 @@ html, body {
     background-position: 0% 100%;
     background-size: auto; }
     .tiler-viewport#background .tiler-tile {
-      background: transparent; }
+      background: transparent !important; }
   .tiler-viewport .buttons {
     position: absolute;
     z-index: 3;

diff --git a/demo/tiler_demo.sass b/demo/tiler_demo.sass
@@ -17,7 +17,7 @@ html, body
     background-position: 0% 100%
     background-size: auto
     .tiler-tile
-      background: transparent
+      background: transparent !important
 
   .buttons
     position: absolute

diff --git a/lib/tiler.js b/lib/tiler.js
diff --git a/src/tiler.coffee b/src/tiler.coffee
@@ -2,7 +2,7 @@
 # * tiler
 # * https://github.com/brewster1134/tiler
 # *
-# * @version 1.0.4
+# * @version 2.0.1
 # * @author Ryan Brewster
 # * Copyright (c) 2014
 # * Licensed under the MIT license.
@@ -158,27 +158,16 @@
     #
     _setupTiles: ->
       self = @
-      tileWidths = [ @element.outerWidth() ]
-      tileHeights = [ @element.outerHeight() ]
-
-      # Remove any inline sizes from tiles
-      @$tiles.css
-        width: ''
-        height: ''
 
       # Loop through all tiles
       @$tiles.each ->
-        # Add natural dimensions
-        tileWidths.push $(@).outerWidth()
-        tileHeights.push $(@).outerHeight()
-
         # Add a data attribute with the viewport id
         $(@).attr 'data-tiler-viewport-id', self.element.attr('id')
 
       # Set sizes
       @element.add(@$tiles).css
-        width: Math.max tileWidths...
-        height: Math.max tileHeights...
+        width: @element.outerWidth()
+        height: @element.outerHeight()
 
     # Determine if we are advancing or retreating through our virtual tiles
     #