Merge branch 'dev'

# Conflicts:
#	.versions

.versions

@@ -1,18 +1,18 @@
-[email protected].4
+[email protected].8
 [email protected]
-[email protected].11
+[email protected].12
 [email protected]
-[email protected].0
+[email protected].8
 [email protected]
 [email protected]
 [email protected]
-gantrim:[email protected].3
-[email protected].0
-[email protected].10
-[email protected].2
-[email protected].4
+gantrim:[email protected].8
+[email protected].1
+[email protected].11
+[email protected].6
+[email protected].6
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]

lib/js/bin/materialize.js

@@ -1210,7 +1210,9 @@ $(document).ready(function(){
         $index = 0;
       }
 
-      $content = $($active[0].hash);
+      if ($active[0] !== undefined) {
+        $content = $($active[0].hash);
+      }
 
       // append indicator then set indicator width to tab width
       $this.append('<div class="indicator"></div>');
@@ -1249,7 +1251,10 @@ $(document).ready(function(){
 
         // Make the old tab inactive.
         $active.removeClass('active');
-        $content.hide();
+
+          if ($content !== undefined) {
+              $content.hide();
+          }
 
         // Update the variables with the new link and content
         $active = $(this);

lib/js/tabs.js

@@ -32,7 +32,9 @@
         $index = 0;
       }
 
-      $content = $($active[0].hash);
+      if ($active[0] !== undefined) {
+        $content = $($active[0].hash);
+      }
 
       // append indicator then set indicator width to tab width
       $this.append('<div class="indicator"></div>');
@@ -71,7 +73,9 @@
 
         // Make the old tab inactive.
         $active.removeClass('active');
-        $content.hide();
+        if ($content !== undefined) {
+          $content.hide();
+        }
 
         // Update the variables with the new link and content
         $active = $(this);

package.js

@@ -3,14 +3,14 @@
 Package.describe({
     name: 'gantrim:materialize-stylus',  // http://atmospherejs.com/materialize/materialize
     summary: 'Materialize (official): A modern responsive front-end framework based on Material Design',
-    version: '1.1.3',
+    version: '1.1.8',
     git: 'https://github.com/gantrim/meteor-materialize-stylus'
 });
 
 Package.onUse(function (api) {
-    api.versionsFrom('METEOR@1.2.1');
+    api.versionsFrom('METEOR@1.6.0.1');
 
-    api.use('[email protected].14');
+    api.use('[email protected].13');
     api.use('jquery', 'client');
     api.imply('jquery', 'client');