Add context key as option, tag as 1.0.2

kamalkhan · Jul 25, 2014 · f7d26a7 · f7d26a7
1 parent 1a2d1c8
commit f7d26a7
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 28 deletions.
diff --git a/awesome-grid-1.0.1.min.js b/awesome-grid-1.0.1.min.js
diff --git a/awesome-grid-1.0.1.js → awesome-grid-1.0.2.js b/awesome-grid-1.0.1.js → awesome-grid-1.0.2.js
@@ -105,9 +105,12 @@ THE SOFTWARE.
 
             var C = self._ColumnsArr;
             var columns = C[C.length - 1];
+            var context = self.options.context == 'self'
+            ? self.$elem.width()
+            : window.innerWidth;
             for(var i = 0; i < C.length; i++)
             {
-                if(C[i][0] && (window.innerWidth <= C[i][0]))
+                if(C[i][0] && (context <= C[i][0]))
                 {
                     columns = C[i][1];
                 }
@@ -247,6 +250,7 @@ THE SOFTWARE.
         colSpacing  : 20,
         initSpacing : 0,
         columns     : 2,
+        context     : 'window',
         responsive  : true,
         fadeIn      : true,
         hiddenClass : false,

diff --git a/awesome-grid-1.0.2.min.js b/awesome-grid-1.0.2.min.js
diff --git a/awesome-grid-1.0.2.min.js.map b/awesome-grid-1.0.2.min.js.map
diff --git a/demo/index.html b/demo/index.html
@@ -61,7 +61,7 @@ <h1>Awesome Grid <span>Demo</span></h1>
 
     <!-- Stylesheets -->
     <script src="js/jquery.min.js"></script>
-    <script src="../awesome-grid-1.0.1.min.js"></script>
+    <script src="../awesome-grid-1.0.2.min.js"></script>
     <script>
         $(window).load(function(){
             $('ul.grid').AwesomeGrid({