diff --git a/core-js/pom.xml b/core-js/pom.xml index 2da4c532..9931cbc4 100644 --- a/core-js/pom.xml +++ b/core-js/pom.xml @@ -51,6 +51,7 @@ ${basedir}/target/tmp/header-min.js ${basedir}/target/tmp/Functions-min.js ${basedir}/target/tmp/Utils-min.js + ${basedir}/../mindplot/src/main/javascript/Options.js ${basedir}/../mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js diff --git a/mindplot/pom.xml b/mindplot/pom.xml index c24fd1e9..1ddf1632 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -125,6 +125,7 @@ header.js Events.js + Options.js ${basedir}/../web2d/target/classes/web2d.svg-min.js Messages.js TopicEventDispatcher.js diff --git a/mindplot/src/main/javascript/Options.js b/mindplot/src/main/javascript/Options.js index 45d9a456..67b5f6a9 100644 --- a/mindplot/src/main/javascript/Options.js +++ b/mindplot/src/main/javascript/Options.js @@ -1,4 +1,4 @@ -mindplot.Options = new Class({ +Options = new Class({ setOptions: function(){ var options = this.options = Object.merge.apply(null, [{}, this.options].append(arguments)); diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js index acf62a04..0bd72b6f 100644 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js +++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js @@ -1,5 +1,5 @@ var BootstrapDialog = new Class({ - Implements: mindplot.Options, + Implements: Options, options: { cancelButton: false, diff --git a/mindplot/src/main/javascript/widget/FloatingTip.js b/mindplot/src/main/javascript/widget/FloatingTip.js index c455d784..abbbd565 100644 --- a/mindplot/src/main/javascript/widget/FloatingTip.js +++ b/mindplot/src/main/javascript/widget/FloatingTip.js @@ -17,7 +17,7 @@ */ mindplot.widget.FloatingTip = new Class({ - Implements: [mindplot.Options, mindplot.Events], + Implements: [Options, mindplot.Events], options: { animation: true,