Merge pull request #233 from Aaike/master

added jquery-ui dependency for fancytree
This commit is contained in:
Guy Bedford
2015-03-02 15:49:45 +02:00
3 changed files with 10 additions and 5 deletions
@@ -5,11 +5,14 @@
"lib": "source/stable" "lib": "source/stable"
}, },
"dependencies": { "dependencies": {
"jquery": "*" "jquery": "github:components/jquery",
"jquery-ui": "github:components/jqueryui"
}, },
"shim": { "shim": {
"jquery-ui-layout": { "jquery-ui-layout": {
"deps": "jquery" "deps": ["jquery","jquery-ui"]
} }
} }
} }
@@ -5,11 +5,12 @@
"lib": "dist" "lib": "dist"
}, },
"dependencies": { "dependencies": {
"jquery": "*" "jquery": "github:components/jquery",
"jquery-ui": "github:components/jqueryui"
}, },
"shim": { "shim": {
"jquery-fancytree": { "jquery-fancytree": {
"deps": "jquery" "deps": ["jquery","jquery-ui"]
} }
} }
} }
+1
View File
@@ -20,6 +20,7 @@
"angular-breadcrumb": "github:ncuillery/angular-breadcrumb", "angular-breadcrumb": "github:ncuillery/angular-breadcrumb",
"angular-cookies": "github:angular/bower-angular-cookies", "angular-cookies": "github:angular/bower-angular-cookies",
"angular-file-upload": "github:danialfarid/angular-file-upload-bower", "angular-file-upload": "github:danialfarid/angular-file-upload-bower",
"angular-google-maps": "github:angular-ui/angular-google-maps",
"angular-http-auth": "github:witoldsz/angular-http-auth", "angular-http-auth": "github:witoldsz/angular-http-auth",
"angular-loading-bar": "github:chieffancypants/angular-loading-bar", "angular-loading-bar": "github:chieffancypants/angular-loading-bar",
"angular-locker": "github:tymondesigns/angular-locker", "angular-locker": "github:tymondesigns/angular-locker",