From 03633ae4ab7200bc1e4a6d44d4d067d5caa521f9 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekeghem Date: Sat, 24 Jan 2015 22:12:38 +0700 Subject: [PATCH 1/8] added happy -> github:henrikjoreteg/Happy.js --- package-overrides/github/henrikjoreteg/Happy.js@v0.8.json | 4 ++++ registry.json | 1 + 2 files changed, 5 insertions(+) create mode 100644 package-overrides/github/henrikjoreteg/Happy.js@v0.8.json diff --git a/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json new file mode 100644 index 0000000..1677fb1 --- /dev/null +++ b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json @@ -0,0 +1,4 @@ +{ + "main": "./happy.js", + "registry": "jspm" +} \ No newline at end of file diff --git a/registry.json b/registry.json index 32ad428..9cebf15 100644 --- a/registry.json +++ b/registry.json @@ -94,6 +94,7 @@ "hammer": "github:hammerjs/hammer.js", "handlebars": "github:components/handlebars.js", "handlebars.js": "github:components/handlebars.js", + "happy": "github:henrikjoreteg/Happy.js", "http": "github:jspm/nodelibs-http", "https": "github:jspm/nodelibs-https", "i18next-client": "npm:i18next-client", From 12f54b1d5c46c6de3b7651876ed1289fe6205e6c Mon Sep 17 00:00:00 2001 From: Aaike Van Roekeghem Date: Sat, 24 Jan 2015 22:40:10 +0700 Subject: [PATCH 2/8] added jquery-validation -> github/jzaefferer/jquery-validation --- .../jzaefferer/jquery-validation@1.13.1.json | 14 ++++++++++++++ registry.json | 1 + 2 files changed, 15 insertions(+) create mode 100644 package-overrides/github/jzaefferer/jquery-validation@1.13.1.json diff --git a/package-overrides/github/jzaefferer/jquery-validation@1.13.1.json b/package-overrides/github/jzaefferer/jquery-validation@1.13.1.json new file mode 100644 index 0000000..7dc24aa --- /dev/null +++ b/package-overrides/github/jzaefferer/jquery-validation@1.13.1.json @@ -0,0 +1,14 @@ +{ + "main": "./dist/jquery.validate.js", + "registry": "jspm", + "shim": { + "jquery-validation": { + "deps": [ + "jquery" + ] + } + }, + "dependencies": { + "jquery": "jquery@^2.1.1" + } +} \ No newline at end of file diff --git a/registry.json b/registry.json index 9cebf15..10e773f 100644 --- a/registry.json +++ b/registry.json @@ -109,6 +109,7 @@ "jquery-pjax": "github:defunkt/jquery-pjax", "jquery.cookie": "github:carhartl/jquery-cookie", "jquery.hammer": "github:hammerjs/jquery.hammer.js", + "jquery-validation": "github:jzaefferer/jquery-validation", "jsfromhell": "github:jonasraoni/JSFromHell", "jsplumb": "github:sporritt/jsPlumb", "kickstrap": "github:ajkochanowicz/Kickstrap", From e3ef332b6622114375df0cd3a03387f20ef1630c Mon Sep 17 00:00:00 2001 From: Aaike Van Roekeghem Date: Sun, 25 Jan 2015 01:16:52 +0700 Subject: [PATCH 3/8] added jquery as the default dependency for happy --- package-overrides/github/henrikjoreteg/Happy.js@v0.8.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json index 1677fb1..c9093a5 100644 --- a/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json +++ b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json @@ -1,4 +1,7 @@ { "main": "./happy.js", - "registry": "jspm" + "registry": "jspm", + "dependencies": { + "jquery": "jquery@^2.1.1" + } } \ No newline at end of file From bc604569aded64f54e36be7bb7ba98a26b52ff50 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekeghem Date: Sun, 25 Jan 2015 01:55:10 +0700 Subject: [PATCH 4/8] added missing shim for happy --- package-overrides/github/henrikjoreteg/Happy.js@v0.8.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json index c9093a5..23a96be 100644 --- a/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json +++ b/package-overrides/github/henrikjoreteg/Happy.js@v0.8.json @@ -1,6 +1,13 @@ { "main": "./happy.js", "registry": "jspm", + "shim": { + "happy": { + "deps": [ + "jquery" + ] + } + }, "dependencies": { "jquery": "jquery@^2.1.1" } From 760107afbd00b74c68f0f47280efcbd596284484 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sun, 25 Jan 2015 13:38:28 +0100 Subject: [PATCH 5/8] add override for angular-material@0.7.0 --- .../github/angular/bower-material@0.7.0.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@0.7.0.json diff --git a/package-overrides/github/angular/bower-material@0.7.0.json b/package-overrides/github/angular/bower-material@0.7.0.json new file mode 100644 index 0000000..f4132f9 --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.7.0.json @@ -0,0 +1,22 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": [ + "./angular-material.css!", + "angular", + "hammer", + "angular-animate", + "angular-aria" + ] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0", + "angular-animate": "^1.3.0", + "angular-aria": "^1.3.0", + "hammer": "^2.0.2", + "css": "^0.1.0" + } +} From 1c37bce2b6ac31fdef808cb62530515a3a2eb955 Mon Sep 17 00:00:00 2001 From: guybedford Date: Mon, 26 Jan 2015 11:17:50 +0200 Subject: [PATCH 6/8] add datatables shim --- package-overrides/github/DataTables/DataTables@1.10.4.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package-overrides/github/DataTables/DataTables@1.10.4.json b/package-overrides/github/DataTables/DataTables@1.10.4.json index 58534c2..340a6c7 100644 --- a/package-overrides/github/DataTables/DataTables@1.10.4.json +++ b/package-overrides/github/DataTables/DataTables@1.10.4.json @@ -6,5 +6,8 @@ "registry": "jspm", "dependencies": { "jquery": "^1.11.2" + }, + "shim": { + "js/jquery.dataTables": ["jquery"] } } \ No newline at end of file From e348ee34648a87096b86979aa268e7d33ff02b16 Mon Sep 17 00:00:00 2001 From: guybedford Date: Mon, 26 Jan 2015 11:21:07 +0200 Subject: [PATCH 7/8] remove datatables --- .../github/DataTables/DataTables@1.10.4.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 package-overrides/github/DataTables/DataTables@1.10.4.json diff --git a/package-overrides/github/DataTables/DataTables@1.10.4.json b/package-overrides/github/DataTables/DataTables@1.10.4.json deleted file mode 100644 index 340a6c7..0000000 --- a/package-overrides/github/DataTables/DataTables@1.10.4.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "directories": { - "lib": "media" - }, - "main": "js/jquery.dataTables", - "registry": "jspm", - "dependencies": { - "jquery": "^1.11.2" - }, - "shim": { - "js/jquery.dataTables": ["jquery"] - } -} \ No newline at end of file From f8addab199b95fa6a8d24c4b61d7427f5a6e272e Mon Sep 17 00:00:00 2001 From: tejens Date: Mon, 26 Jan 2015 11:00:04 -0500 Subject: [PATCH 8/8] Added the proper shim for jquery dependency. --- package-overrides/github/DataTables/DataTables@1.10.4.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package-overrides/github/DataTables/DataTables@1.10.4.json b/package-overrides/github/DataTables/DataTables@1.10.4.json index 58534c2..d43fe94 100644 --- a/package-overrides/github/DataTables/DataTables@1.10.4.json +++ b/package-overrides/github/DataTables/DataTables@1.10.4.json @@ -6,5 +6,11 @@ "registry": "jspm", "dependencies": { "jquery": "^1.11.2" + }, + "shim": { + "js/jquery.dataTables": { + "imports": "jquery", + "exports": "$" + } } } \ No newline at end of file