Merge remote-tracking branch 'upstream/master'

Conflicts: registry.json
2015-06-05 15:25:51 +02:00
parent e7f9a2ceee c86c7fee17
commit d2281c9109
11 changed files with 79 additions and 2 deletions
@@ -0,0 +1,9 @@
+{
+  "format": "global",
+  "main": "build/auth0-lock.min",
+  "shim": {
+    "build/auth0-lock.min": {
+      "exports": "Auth0Lock"
+    }
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "main": "build/hotkeys",
+  "registry": "jspm",
+  "dependencies": {
+    "angular": "^1.2.0"
+  },
+  "shim": {
+    "build/hotkeys": {
+      "deps": ["angular"]
+    }
+  }
+}
@@ -5,5 +5,5 @@
      "exports": "Handlebars"
    }
  },
-  "files": ["handlebars.js"]
+  "files": ["handlebars.js", "handlebars.runtime.js"]
 }
@@ -0,0 +1,3 @@
+{
+  "main": "jsol.js"
+}
@@ -0,0 +1,13 @@
+{
+  "main": "isteven-omni-bar.js",
+  "dependencies": {
+      "css": "^0.1.10"
+    },  
+  "shim": {
+    "isteven-omni-bar": {
+      "deps": [
+        "./isteven-omni-bar.css!"
+      ]
+    }
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "format": "global",
+  "shim": {
+    "traceur-runtime": {
+      "exports": "$traceurRuntime"
+    }
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "format": "global",
+  "shim": {
+    "traceur": {
+      "exports": "traceur"
+    }
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "main": "velocity.js",
+  "files": [
+    "velocity.js",
+    "velocity.min.js",
+    "velocity.ui.js",
+    "velocity.ui.min.js"
+  ],
+  "format": "global"
+}
@@ -2,7 +2,12 @@
  "main": "js/foundation/foundation",
  "shim": {
    "js/foundation/foundation.*": "./foundation",
-    "js/foundation/foundation": ["jquery", "../vendor/custom.modernizr"]
+    "js/foundation/foundation": {
+      "deps": ["jquery", "../vendor/custom.modernizr"]
+    }
+  },
+  "dependencies": {
+    "jquery": "github:components/jquery"
  },
  "ignore": [
    "js/foundation.min.js", 
@@ -8,6 +8,9 @@
      "exports": "Foundation"
    }
  },
+  "dependencies": {
+    "jquery": "github:components/jquery"
+  },
  "ignore": [
    "js/foundation.min.js", 
    "js/vendor/jquery.cookie.js",