diff --git a/omega-web/bower.json b/omega-web/bower.json index f7a4c46..cfc8d5c 100644 --- 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 index 01b6e16..b0ca0bc 100644 --- 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 index 1f7b040..1f3686d 100644 --- 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