Add bower dependencies, clean repository

vodkabears · Oct 26, 2014 · 252a94c · 252a94c
1 parent 463d41a
commit 252a94c
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 22,071 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "libs"
+}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 .idea/
-node_modules/
+node_modules/
+libs/
+!libs/jquery-loader.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -72,7 +72,7 @@ module.exports = function(grunt) {
         qunit: {
             all: {
                 options: {
-                    urls: [ "1.11.1", "2.1.1" ].map(function(version) {
+                    urls: [ "", "2" ].map(function(version) {
                         return "http://localhost:<%= connect.server.options.port %>" +
                             "/test/vide.html?jquery=" + version;
                     })

diff --git a/bower.json b/bower.json
@@ -1,32 +1,40 @@
 {
-    "name": "vide",
-    "version": "0.1.4",
-    "homepage": "http://vodkabears.github.io/vide/",
-    "authors": [
-        "Ilya Makarov <[email protected]>"
-    ],
-    "description": "Easy as hell jQuery plugin for video backgrounds.",
-    "main": "dist/jquery.vide.js",
-    "ignore": [
-        "**/.*",
-        "examples/",
-        "libs/",
-        "src/",
-        "test/",
-        "*.md",
-        "Gruntfile.js",
-        "package.json",
-        "vide.jquery.json"
-    ],
-    "keywords": [
-        "jquery",
-        "plugin",
-        "jquery-plugin",
-        "video",
-        "background",
-        "ui",
-        "responsive",
-        "declarative"
-    ],
-    "license": "MIT"
+  "name": "vide",
+  "version": "0.1.4",
+  "homepage": "http://vodkabears.github.io/vide/",
+  "authors": [
+    "Ilya Makarov <[email protected]>"
+  ],
+  "description": "Easy as hell jQuery plugin for video backgrounds.",
+  "main": "dist/jquery.vide.js",
+  "ignore": [
+    "**/.*",
+    "examples/",
+    "libs/",
+    "src/",
+    "test/",
+    "*.md",
+    "Gruntfile.js",
+    "package.json",
+    "vide.jquery.json"
+  ],
+  "keywords": [
+    "jquery",
+    "plugin",
+    "jquery-plugin",
+    "video",
+    "background",
+    "ui",
+    "responsive",
+    "declarative"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "jquery": "*"
+  },
+  "devDependencies": {
+    "qunit": "~1.15.0",
+    "jquery": "jquery#^1.11.1",
+    "jquery2": "jquery#^2.1.1"
+  }
 }
diff --git a/examples/block-bg.html b/examples/block-bg.html
@@ -18,7 +18,7 @@
 <div id="block2" style="width: 100%; height: 500px;" data-vide-bg="mp4: video/ocean, webm: video/ocean, ogv: http://vodkabears.github.io/vide/video/ocean, poster: video/ocean" data-vide-options="position: 0% 50%"></div>
 
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script>window.jQuery || document.write('<script src="../libs/jquery/jquery-1.11.1.min.js"><\/script>')</script>
+<script>window.jQuery || document.write('<script src="../libs/jquery/dist/jquery.min.js"><\/script>')</script>
 <script src="../src/jquery.vide.js"></script>
 <script>
 //    $(document).ready(function () {

diff --git a/examples/body-bg.html b/examples/body-bg.html
@@ -13,7 +13,7 @@
 </head>
 <body data-vide-bg="video/ocean">
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script>window.jQuery || document.write('<script src="../libs/jquery/jquery-1.11.1.min.js"><\/script>')</script>
+<script>window.jQuery || document.write('<script src="../libs/jquery/dist/jquery.min.js"><\/script>')</script>
 <script src="../src/jquery.vide.js"></script>
 <script>
 //    $(document).ready(function () {
@@ -25,4 +25,4 @@
 //    });
 </script>
 </body>
-</html>
+</html>
diff --git a/libs/jquery-loader.js b/libs/jquery-loader.js
@@ -1,12 +1,6 @@
 (function () {
-    // Default to the local version.
-    var path = '../libs/jquery/jquery-1.11.1.js';
     // Get any jquery=___ param from the query string.
     var jqversion = location.search.match(/[?&]jquery=(.*?)(?=&|$)/);
-    // If a version was specified, use that version from code.jquery.com.
-    if (jqversion) {
-        path = '../libs/jquery/jquery-' + jqversion[1] + '.js';
-    }
 
-    document.write('<script src="' + path + '"></script>');
+    document.write("<script src='../libs/jquery" + jqversion[1] + "/dist/jquery.js'></script>");
 }());