move reinit functions to $.Metro.init*

lolandkidtress · Dec 14, 2013 · df5baa3 · df5baa3
1 parent b30a75d
commit df5baa3
Show file tree

Hide file tree

Showing 89 changed files with 482 additions and 384 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 .zip
 *id_rsa*
 *.nupkg
+
+node_modules
diff --git a/compress/compressor.js b/compress/compressor.js
@@ -47,7 +47,7 @@ new compressor.minify({
 new compressor.minify({
     type: 'yui-css',
     fileIn: css_path+'metro-bootstrap.css',
-    fileOut: css_compile_path+'metro.min.css',
+    fileOut: css_compile_path+'metro-bootstrap.min.css',
     callback: function(err, min){
         if (err) console.log(err); else console.log("main css compiled");
     }

diff --git a/css/metro-bootstrap.css b/css/metro-bootstrap.css
@@ -1,5 +1,5 @@
 /*!
- * Metro Bootstrap v 2.0.4
+ * Metro Bootstrap v 2.0.7
  *
  * Copyright 2012-2013 Sergey Pimenov
  * Licensed under the MIT License (MIT)

diff --git a/docs/accordion.html b/docs/accordion.html
@@ -19,7 +19,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/balloon.html b/docs/balloon.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/buttons.html b/docs/buttons.html
@@ -19,7 +19,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/calendar.html b/docs/calendar.html
@@ -19,7 +19,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/carousel.html b/docs/carousel.html
@@ -19,7 +19,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/datepicker.html b/docs/datepicker.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/dialog.html b/docs/dialog.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/fluent-menu.html b/docs/fluent-menu.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/forms.html b/docs/forms.html
@@ -17,8 +17,9 @@
     <script src="js/jquery/jquery.mousewheel.js"></script>
     <script src="js/prettify/prettify.js"></script>
 
-    <!-- Local JavaScript -->
-    <script src="js/metro.min.js"></script>
+    <!-- Metro UI CSS JavaScript plugins -->
+    <script src="js/load-metro.js"></script>
+
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>
     <script src="js/github.info.js"></script>

diff --git a/docs/global.html b/docs/global.html
@@ -19,7 +19,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/grid.html b/docs/grid.html
@@ -21,7 +21,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/hint.html b/docs/hint.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/icons.html b/docs/icons.html
@@ -18,7 +18,7 @@
     <script src="js/prettify/prettify.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/images.html b/docs/images.html
@@ -19,7 +19,7 @@
     <script src="js/holder/holder.js"></script>
 
     <!-- Metro UI CSS JavaScript plugins -->
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
 
     <!-- Local JavaScript -->
     <script src="js/docs.js"></script>

diff --git a/docs/index.html b/docs/index.html
@@ -16,7 +16,8 @@
     <script src="js/jquery/jquery.widget.min.js"></script>
     <script src="js/prettify/prettify.js"></script>
 
-    <script src="js/metro.min.js"></script>
+    <script src="js/load-metro.js"></script>
+
     <script src="js/docs.js"></script>
     <script src="js/github.info.js"></script>
 

diff --git a/docs/js/docs.js b/docs/js/docs.js
@@ -1,6 +1,7 @@
 function reinit()
 {
-    $('.dropdown-menu').dropdown({effect: 'slide'});
+    //$('.dropdown-menu').dropdown({effect: 'slide'});
+    $.Metro.initDropdowns();
 }
 
 $(function(){

diff --git a/docs/js/load-metro.js b/docs/js/load-metro.js
@@ -0,0 +1,7 @@
+$(function(){
+    if (document.location.host.indexOf('.dev') > -1) {
+        $("<script/>").attr('src', 'js/metro/metro-loader.js').appendTo($('head'));
+    } else {
+        $("<script/>").attr('src', 'js/metro.min.js').appendTo($('head'));
+    }
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,5 @@ @@
     .zip
     *id_rsa*
     *.nupkg
+    node_modules