Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Commit

Permalink
chore(build): Moved underscore.string to bower dependencies and fixed…
Browse files Browse the repository at this point in the history
… macgyver-string-filter.js not building correctly

Fixes #156

BREAKING CHANGES: Underscore.string is not compiled into MacGyver and in order for underscore.string filter to work, user must externally include that library
adrianlee44 committed Feb 28, 2014
1 parent 4698da4 commit df95c21
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -33,13 +33,13 @@
],
"devDependencies": {
"angular-mocks": "~1.2.2",
"underscore.string": "~2.3.3",
"jquery": "~2.0.3",
"jquery-file-upload": "~8.8.2",
"jquery.ui": "~1.10.3"
},
"dependencies": {
"angular": "~1.2.2",
"angular-animate": "~1.2.2"
"angular-animate": "~1.2.2",
"underscore.string": "~2.3.3"
}
}
8 changes: 2 additions & 6 deletions build.json
Original file line number Diff line number Diff line change
@@ -2,14 +2,12 @@
"example": [
"tmp/app/main.js",
"tmp/jqueryui.js",
"vendor/bower/underscore.string/lib/underscore.string.js",
"vendor/bower/jquery-file-upload/js/jquery.fileupload.js",
"tmp/app/**/*.js"
],
"full": [
"tmp/app/main.js",
"tmp/jqueryui.js",
"vendor/bower/underscore.string/lib/underscore.string.js",
"vendor/bower/jquery-file-upload/js/jquery.fileupload.js",
"tmp/app/**/*.js",
"!tmp/app/example_controller/*.js"
@@ -37,12 +35,10 @@
"tmp/app/directives/tooltip.js"
],
"filters": [
"tmp/app/filters/*.js",
"!tmp/app/filters/underscore.string.js"
"tmp/app/filters/*.js"
],
"underscoreFilter": [
"vendor/bower/underscore.string/lib/underscore.string.js",
"tmp/app/filters/underscore.string.js"
"tmp/app/filters/underscore.js"
],
"table": [
"vendor/bower/jquery.ui/ui/jquery.ui.core.js",
1 change: 1 addition & 0 deletions src/layout.jade
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@ html
script(src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js", type='text/javascript')
script(src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js", type="text/javascript")
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.2/angular.min.js", type="text/javascript")
script(src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js", type="text/javascript")
script(src="//code.angularjs.org/1.2.2/angular-animate.js", type="text/javascript")
script(src='js/MacGyver.js', type="text/javascript")
script.

0 comments on commit df95c21

Please sign in to comment.