Follow jsondiffpatch package structure change. Remove bootstrap-select.

FelisCatus · Oct 20, 2014 · 80978b6 · 80978b6
1 parent 027f684
commit 80978b6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/omega-web/bower.json b/omega-web/bower.json
@@ -91,7 +91,7 @@
       "": "build/*.min.js"
     },
     "jsondiffpatch": {
-      "": "build/*.min.js"
+      "": "public/build/jsondiffpatch.min.js"
     },
     "spectrum": {
       "": [

diff --git a/omega-web/src/coffee/options.coffee b/omega-web/src/coffee/options.coffee
@@ -26,7 +26,7 @@ $script.ready ['angular-loader'], ->
     'lib/ngprogress/ngProgress.min.js'
     'lib/angular-ui-sortable/sortable.min.js'
     'lib/angular-ui-utils/validate.min.js'
-    'lib/jsondiffpatch/bundle.min.js'
+    'lib/jsondiffpatch/jsondiffpatch.min.js'
     'lib/angular-spectrum-colorpicker/angular-spectrum-colorpicker.min.js'
   ], 'omega-deps')
 $script.ready ['jquery'], ->

diff --git a/omega-web/src/options.jade b/omega-web/src/options.jade
@@ -7,7 +7,6 @@ html(lang='en' ng-controller='MasterCtrl' ng-csp)
     link(rel='stylesheet' href='lib/bootstrap/css/bootstrap.min.css')
     link(rel='stylesheet' href='lib/spectrum/spectrum.css')
     link(rel='stylesheet' href='lib/ladda/ladda-themeless.min.css')
-    link(rel='stylesheet' href='lib/bootstrap-select/bootstrap-select.css')
     link(rel='stylesheet' href='css/options.css')
   body(style='display: none;' ng-style='{display: options ? "block" : "none"}')
     .container-fluid