FLOE-405: Move non-Infusion external libs into an /ext directory

fluid-project · Mar 1, 2016 · 60abf99 · 60abf99
1 parent bfe9ebd
commit 60abf99
Show file tree

Hide file tree

Showing 88 changed files with 54 additions and 34 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -28,12 +28,28 @@ module.exports = function (grunt) {
         },
         jsonlint: {
             all: ["package.json", ".jshintrc", "src/**/*.json", "tests/**/*.json", "demos/**/*.json"]
+        },
+        copy: {
+            // Copy external front end dependencies into appropriate directories
+            frontEndDependencies: {
+                files: [
+                    // D3
+                    {src: "./node_modules/d3/d3.js", dest: "./public/src/lib/ext/d3/d3.js"},
+                    // D3 license
+                    {src: "./node_modules/d3/LICENSE", dest: "./public/src/lib/ext/d3LICENSE"},
+                    // Flocking /dist directory
+                    {expand: true, cwd: "./node_modules/flocking/dist/", src: "**", dest: "./public/src/lib/ext/flocking/dist/"},
+                    // Flocking /src directory
+                    {expand: true, cwd: "./node_modules/flocking/src/", src: "**", dest: "./public/src/lib/ext/flocking/src/"}
+                ]
+            }
         }
     });
 
     // Load the plugin(s):
     grunt.loadNpmTasks("grunt-contrib-jshint");
     grunt.loadNpmTasks("grunt-jsonlint");
+    grunt.loadNpmTasks("grunt-contrib-copy");
 
     // Custom tasks:
 

diff --git a/package.json b/package.json
@@ -5,7 +5,10 @@
   "author": "Fluid Project",
   "bugs": "https://issues.fluidproject.org/browse/FLOE/component/11615",
   "homepage": "http://www.fluidproject.org/",
-  "dependencies": {},
+  "dependencies": {
+      "d3":"latest",
+      "flocking":"https://github.com/colinbdclark/Flocking"      
+  },
   "licenses": [
     {
       "type": "BSD-3-Clause",
@@ -32,6 +35,7 @@
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-jshint": "~0.9.0",
-    "grunt-jsonlint": "1.0.4"
+    "grunt-jsonlint": "1.0.4",
+    "grunt-contrib-copy": "latest"
   }
 }
diff --git a/public/demos/index.html b/public/demos/index.html
@@ -9,14 +9,14 @@
         <link rel="stylesheet" type="text/css" href="../src/lib/infusion/src/components/inlineEdit/css/InlineEdit.css" />
 
         <script type="text/javascript" src="../src/lib/infusion/infusion-custom.js"></script>
-        <script type="text/javascript" src="../src/lib/d3/d3.js"></script>
-
-        <script type="text/javascript" src="../src/lib/flocking/flocking-base.js"></script>
-        <script type="text/javascript" src="../src/lib/flocking/ugens/oscillators.js"></script>
-        <script type="text/javascript" src="../src/lib/flocking/ugens/math.js"></script>
-        <script type="text/javascript" src="../src/lib/flocking/ugens/envelopes.js"></script>
-        <script type="text/javascript" src="../src/lib/flocking/ugens/midi.js"></script>
-        <script type="text/javascript" src="../src/lib/flocking/ugens/scheduling.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/d3/d3.js"></script>
+
+        <script type="text/javascript" src="../src/lib/ext/flocking/flocking-base.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/flocking/ugens/oscillators.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/flocking/ugens/math.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/flocking/ugens/envelopes.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/flocking/ugens/midi.js"></script>
+        <script type="text/javascript" src="../src/lib/ext/flocking/ugens/scheduling.js"></script>
 
         <script type="text/javascript" src="../src/js/valueBinding.js"></script>
         <script type="text/javascript" src="../src/js/percentage.js"></script>

diff --git a/public/src/lib/d3/LICENSE → public/src/lib/ext/d3/LICENSE b/public/src/lib/d3/LICENSE → public/src/lib/ext/d3/LICENSE
diff --git a/public/src/lib/d3/d3.js → public/src/lib/ext/d3/d3.js b/public/src/lib/d3/d3.js → public/src/lib/ext/d3/d3.js
diff --git a/public/src/lib/d3/d3.min.js → public/src/lib/ext/d3/d3.min.js b/public/src/lib/d3/d3.min.js → public/src/lib/ext/d3/d3.min.js
diff --git a/public/src/lib/flocking/dist/flocking-all.js → ...src/lib/ext/flocking/dist/flocking-all.js b/public/src/lib/flocking/dist/flocking-all.js → ...src/lib/ext/flocking/dist/flocking-all.js
diff --git a/...src/lib/flocking/dist/flocking-all.min.js → ...lib/ext/flocking/dist/flocking-all.min.js b/...src/lib/flocking/dist/flocking-all.min.js → ...lib/ext/flocking/dist/flocking-all.min.js
diff --git a/.../dist/flocking-audiofile-compatibility.js → .../dist/flocking-audiofile-compatibility.js b/.../dist/flocking-audiofile-compatibility.js → .../dist/flocking-audiofile-compatibility.js
diff --git a/...locking/dist/flocking-audiofile-worker.js → ...locking/dist/flocking-audiofile-worker.js b/...locking/dist/flocking-audiofile-worker.js → ...locking/dist/flocking-audiofile-worker.js
diff --git a/...ic/src/lib/flocking/dist/flocking-base.js → ...rc/lib/ext/flocking/dist/flocking-base.js b/...ic/src/lib/flocking/dist/flocking-base.js → ...rc/lib/ext/flocking/dist/flocking-base.js
diff --git a/...rc/lib/flocking/dist/flocking-base.min.js → ...ib/ext/flocking/dist/flocking-base.min.js b/...rc/lib/flocking/dist/flocking-base.min.js → ...ib/ext/flocking/dist/flocking-base.min.js
diff --git a/...c/lib/flocking/dist/flocking-no-jquery.js → ...b/ext/flocking/dist/flocking-no-jquery.js b/...c/lib/flocking/dist/flocking-no-jquery.js → ...b/ext/flocking/dist/flocking-no-jquery.js
diff --git a/...b/flocking/dist/flocking-no-jquery.min.js → ...t/flocking/dist/flocking-no-jquery.min.js b/...b/flocking/dist/flocking-no-jquery.min.js → ...t/flocking/dist/flocking-no-jquery.min.js
diff --git a/public/src/lib/flocking/flocking-base.js → public/src/lib/ext/flocking/flocking-base.js b/public/src/lib/flocking/flocking-base.js → public/src/lib/ext/flocking/flocking-base.js
diff --git a/...src/lib/flocking/src/audiofile-encoder.js → ...lib/ext/flocking/src/audiofile-encoder.js b/...src/lib/flocking/src/audiofile-encoder.js → ...lib/ext/flocking/src/audiofile-encoder.js
diff --git a/public/src/lib/flocking/src/audiofile.js → public/src/lib/ext/flocking/src/audiofile.js b/public/src/lib/flocking/src/audiofile.js → public/src/lib/ext/flocking/src/audiofile.js
diff --git a/public/src/lib/flocking/src/buffers.js → public/src/lib/ext/flocking/src/buffers.js b/public/src/lib/flocking/src/buffers.js → public/src/lib/ext/flocking/src/buffers.js
diff --git a/public/src/lib/flocking/src/core.js → public/src/lib/ext/flocking/src/core.js b/public/src/lib/flocking/src/core.js → public/src/lib/ext/flocking/src/core.js
diff --git a/public/src/lib/flocking/src/evaluators.js → ...ic/src/lib/ext/flocking/src/evaluators.js b/public/src/lib/flocking/src/evaluators.js → ...ic/src/lib/ext/flocking/src/evaluators.js
diff --git a/...g/src/flocking-audiofile-compatibility.js → ...g/src/flocking-audiofile-compatibility.js b/...g/src/flocking-audiofile-compatibility.js → ...g/src/flocking-audiofile-compatibility.js
diff --git a/...flocking/src/flocking-audiofile-worker.js → ...flocking/src/flocking-audiofile-worker.js b/...flocking/src/flocking-audiofile-worker.js → ...flocking/src/flocking-audiofile-worker.js
diff --git a/public/src/lib/flocking/src/gfx.js → public/src/lib/ext/flocking/src/gfx.js b/public/src/lib/flocking/src/gfx.js → public/src/lib/ext/flocking/src/gfx.js
diff --git a/public/src/lib/flocking/src/node-list.js → public/src/lib/ext/flocking/src/node-list.js b/public/src/lib/flocking/src/node-list.js → public/src/lib/ext/flocking/src/node-list.js
diff --git a/...c/lib/flocking/src/nodejs/audio-system.js → ...b/ext/flocking/src/nodejs/audio-system.js b/...c/lib/flocking/src/nodejs/audio-system.js → ...b/ext/flocking/src/nodejs/audio-system.js
diff --git a/.../lib/flocking/src/nodejs/buffer-writer.js → .../ext/flocking/src/nodejs/buffer-writer.js b/.../lib/flocking/src/nodejs/buffer-writer.js → .../ext/flocking/src/nodejs/buffer-writer.js
diff --git a/public/src/lib/flocking/src/nodejs/midi.js → ...c/src/lib/ext/flocking/src/nodejs/midi.js b/public/src/lib/flocking/src/nodejs/midi.js → ...c/src/lib/ext/flocking/src/nodejs/midi.js
diff --git a/...lib/flocking/src/nodejs/output-manager.js → ...ext/flocking/src/nodejs/output-manager.js b/...lib/flocking/src/nodejs/output-manager.js → ...ext/flocking/src/nodejs/output-manager.js
diff --git a/public/src/lib/flocking/src/parser.js → public/src/lib/ext/flocking/src/parser.js b/public/src/lib/flocking/src/parser.js → public/src/lib/ext/flocking/src/parser.js
diff --git a/public/src/lib/flocking/src/scheduler.js → public/src/lib/ext/flocking/src/scheduler.js b/public/src/lib/flocking/src/scheduler.js → public/src/lib/ext/flocking/src/scheduler.js
diff --git a/public/src/lib/flocking/src/synths/band.js → ...c/src/lib/ext/flocking/src/synths/band.js b/public/src/lib/flocking/src/synths/band.js → ...c/src/lib/ext/flocking/src/synths/band.js
diff --git a/public/src/lib/flocking/src/synths/group.js → .../src/lib/ext/flocking/src/synths/group.js b/public/src/lib/flocking/src/synths/group.js → .../src/lib/ext/flocking/src/synths/group.js
diff --git a/public/src/lib/flocking/src/synths/model.js → .../src/lib/ext/flocking/src/synths/model.js b/public/src/lib/flocking/src/synths/model.js → .../src/lib/ext/flocking/src/synths/model.js
diff --git a/...src/lib/flocking/src/synths/polyphonic.js → ...lib/ext/flocking/src/synths/polyphonic.js b/...src/lib/flocking/src/synths/polyphonic.js → ...lib/ext/flocking/src/synths/polyphonic.js
diff --git a/...src/lib/flocking/src/ugens/bandlimited.js → ...lib/ext/flocking/src/ugens/bandlimited.js b/...src/lib/flocking/src/ugens/bandlimited.js → ...lib/ext/flocking/src/ugens/bandlimited.js
diff --git a/public/src/lib/flocking/src/ugens/browser.js → ...src/lib/ext/flocking/src/ugens/browser.js b/public/src/lib/flocking/src/ugens/browser.js → ...src/lib/ext/flocking/src/ugens/browser.js
diff --git a/public/src/lib/flocking/src/ugens/buffer.js → .../src/lib/ext/flocking/src/ugens/buffer.js b/public/src/lib/flocking/src/ugens/buffer.js → .../src/lib/ext/flocking/src/ugens/buffer.js
diff --git a/public/src/lib/flocking/src/ugens/core.js → ...ic/src/lib/ext/flocking/src/ugens/core.js b/public/src/lib/flocking/src/ugens/core.js → ...ic/src/lib/ext/flocking/src/ugens/core.js
diff --git a/...c/src/lib/flocking/src/ugens/debugging.js → ...c/lib/ext/flocking/src/ugens/debugging.js b/...c/src/lib/flocking/src/ugens/debugging.js → ...c/lib/ext/flocking/src/ugens/debugging.js
diff --git a/.../src/lib/flocking/src/ugens/distortion.js → .../lib/ext/flocking/src/ugens/distortion.js b/.../src/lib/flocking/src/ugens/distortion.js → .../lib/ext/flocking/src/ugens/distortion.js
diff --git a/...ic/src/lib/flocking/src/ugens/dynamics.js → ...rc/lib/ext/flocking/src/ugens/dynamics.js b/...ic/src/lib/flocking/src/ugens/dynamics.js → ...rc/lib/ext/flocking/src/ugens/dynamics.js
diff --git a/...c/src/lib/flocking/src/ugens/envelopes.js → ...c/lib/ext/flocking/src/ugens/envelopes.js b/...c/src/lib/flocking/src/ugens/envelopes.js → ...c/lib/ext/flocking/src/ugens/envelopes.js
diff --git a/public/src/lib/flocking/src/ugens/filters.js → ...src/lib/ext/flocking/src/ugens/filters.js b/public/src/lib/flocking/src/ugens/filters.js → ...src/lib/ext/flocking/src/ugens/filters.js
diff --git a/public/src/lib/flocking/src/ugens/gates.js → ...c/src/lib/ext/flocking/src/ugens/gates.js b/public/src/lib/flocking/src/ugens/gates.js → ...c/src/lib/ext/flocking/src/ugens/gates.js
diff --git a/...ic/src/lib/flocking/src/ugens/granular.js → ...rc/lib/ext/flocking/src/ugens/granular.js b/...ic/src/lib/flocking/src/ugens/granular.js → ...rc/lib/ext/flocking/src/ugens/granular.js
diff --git a/...c/src/lib/flocking/src/ugens/listening.js → ...c/lib/ext/flocking/src/ugens/listening.js b/...c/src/lib/flocking/src/ugens/listening.js → ...c/lib/ext/flocking/src/ugens/listening.js
diff --git a/public/src/lib/flocking/src/ugens/math.js → ...ic/src/lib/ext/flocking/src/ugens/math.js b/public/src/lib/flocking/src/ugens/math.js → ...ic/src/lib/ext/flocking/src/ugens/math.js
diff --git a/public/src/lib/flocking/src/ugens/midi.js → ...ic/src/lib/ext/flocking/src/ugens/midi.js b/public/src/lib/flocking/src/ugens/midi.js → ...ic/src/lib/ext/flocking/src/ugens/midi.js
diff --git a/...rc/lib/flocking/src/ugens/multichannel.js → ...ib/ext/flocking/src/ugens/multichannel.js b/...rc/lib/flocking/src/ugens/multichannel.js → ...ib/ext/flocking/src/ugens/multichannel.js
diff --git a/...src/lib/flocking/src/ugens/oscillators.js → ...lib/ext/flocking/src/ugens/oscillators.js b/...src/lib/flocking/src/ugens/oscillators.js → ...lib/ext/flocking/src/ugens/oscillators.js
diff --git a/public/src/lib/flocking/src/ugens/random.js → .../src/lib/ext/flocking/src/ugens/random.js b/public/src/lib/flocking/src/ugens/random.js → .../src/lib/ext/flocking/src/ugens/random.js
diff --git a/.../src/lib/flocking/src/ugens/scheduling.js → .../lib/ext/flocking/src/ugens/scheduling.js b/.../src/lib/flocking/src/ugens/scheduling.js → .../lib/ext/flocking/src/ugens/scheduling.js
diff --git a/...ic/src/lib/flocking/src/ugens/triggers.js → ...rc/lib/ext/flocking/src/ugens/triggers.js b/...ic/src/lib/flocking/src/ugens/triggers.js → ...rc/lib/ext/flocking/src/ugens/triggers.js
diff --git a/...lib/flocking/src/ui/editor/css/editor.css → ...ext/flocking/src/ui/editor/css/editor.css b/...lib/flocking/src/ui/editor/css/editor.css → ...ext/flocking/src/ui/editor/css/editor.css
diff --git a/...c/lib/flocking/src/ui/editor/js/editor.js → ...b/ext/flocking/src/ui/editor/js/editor.js b/...c/lib/flocking/src/ui/editor/js/editor.js → ...b/ext/flocking/src/ui/editor/js/editor.js
diff --git a/.../midi/midi-connector/js/midi-connector.js → .../midi/midi-connector/js/midi-connector.js b/.../midi/midi-connector/js/midi-connector.js → .../midi/midi-connector/js/midi-connector.js
diff --git a/...-input-selector/js/midi-input-selector.js → ...-input-selector/js/midi-input-selector.js b/...-input-selector/js/midi-input-selector.js → ...-input-selector/js/midi-input-selector.js
diff --git a/...ng/src/ui/play-button/css/play-button.css → ...ng/src/ui/play-button/css/play-button.css b/...ng/src/ui/play-button/css/play-button.css → ...ng/src/ui/play-button/css/play-button.css
diff --git a/...king/src/ui/play-button/js/play-button.js → ...king/src/ui/play-button/js/play-button.js b/...king/src/ui/play-button/js/play-button.js → ...king/src/ui/play-button/js/play-button.js
diff --git a/...flocking/src/ui/selectbox/js/selectbox.js → ...flocking/src/ui/selectbox/js/selectbox.js b/...flocking/src/ui/selectbox/js/selectbox.js → ...flocking/src/ui/selectbox/js/selectbox.js
diff --git a/.../src/ui/shared/css/flocking-icon-font.css → .../src/ui/shared/css/flocking-icon-font.css b/.../src/ui/shared/css/flocking-icon-font.css → .../src/ui/shared/css/flocking-icon-font.css
diff --git a/...rc/ui/shared/fonts/flocking-icon-font.eot → ...rc/ui/shared/fonts/flocking-icon-font.eot b/...rc/ui/shared/fonts/flocking-icon-font.eot → ...rc/ui/shared/fonts/flocking-icon-font.eot
diff --git a/...rc/ui/shared/fonts/flocking-icon-font.svg → ...rc/ui/shared/fonts/flocking-icon-font.svg b/...rc/ui/shared/fonts/flocking-icon-font.svg → ...rc/ui/shared/fonts/flocking-icon-font.svg
diff --git a/...rc/ui/shared/fonts/flocking-icon-font.ttf → ...rc/ui/shared/fonts/flocking-icon-font.ttf b/...rc/ui/shared/fonts/flocking-icon-font.ttf → ...rc/ui/shared/fonts/flocking-icon-font.ttf
diff --git a/...c/ui/shared/fonts/flocking-icon-font.woff → ...c/ui/shared/fonts/flocking-icon-font.woff b/...c/ui/shared/fonts/flocking-icon-font.woff → ...c/ui/shared/fonts/flocking-icon-font.woff
diff --git a/...i/third-party/normalize/css/normalize.css → ...i/third-party/normalize/css/normalize.css b/...i/third-party/normalize/css/normalize.css → ...i/third-party/normalize/css/normalize.css
diff --git a/.../src/lib/flocking/src/web/audio-system.js → .../lib/ext/flocking/src/web/audio-system.js b/.../src/lib/flocking/src/web/audio-system.js → .../lib/ext/flocking/src/web/audio-system.js
diff --git a/...src/lib/flocking/src/web/buffer-writer.js → ...lib/ext/flocking/src/web/buffer-writer.js b/...src/lib/flocking/src/web/buffer-writer.js → ...lib/ext/flocking/src/web/buffer-writer.js
diff --git a/.../flocking/src/web/input-device-manager.js → .../flocking/src/web/input-device-manager.js b/.../flocking/src/web/input-device-manager.js → .../flocking/src/web/input-device-manager.js
diff --git a/public/src/lib/flocking/src/web/midi.js → public/src/lib/ext/flocking/src/web/midi.js b/public/src/lib/flocking/src/web/midi.js → public/src/lib/ext/flocking/src/web/midi.js
diff --git a/...b/flocking/src/web/native-node-manager.js → ...t/flocking/src/web/native-node-manager.js b/...b/flocking/src/web/native-node-manager.js → ...t/flocking/src/web/native-node-manager.js
diff --git a/...rc/lib/flocking/src/web/output-manager.js → ...ib/ext/flocking/src/web/output-manager.js b/...rc/lib/flocking/src/web/output-manager.js → ...ib/ext/flocking/src/web/output-manager.js
diff --git a/...src/lib/flocking/src/web/webaudio-core.js → ...lib/ext/flocking/src/web/webaudio-core.js b/...src/lib/flocking/src/web/webaudio-core.js → ...lib/ext/flocking/src/web/webaudio-core.js
diff --git a/public/src/lib/flocking/ugens/envelopes.js → ...c/src/lib/ext/flocking/ugens/envelopes.js b/public/src/lib/flocking/ugens/envelopes.js → ...c/src/lib/ext/flocking/ugens/envelopes.js
diff --git a/public/src/lib/flocking/ugens/math.js → public/src/lib/ext/flocking/ugens/math.js b/public/src/lib/flocking/ugens/math.js → public/src/lib/ext/flocking/ugens/math.js
diff --git a/public/src/lib/flocking/ugens/midi.js → public/src/lib/ext/flocking/ugens/midi.js b/public/src/lib/flocking/ugens/midi.js → public/src/lib/ext/flocking/ugens/midi.js
diff --git a/public/src/lib/flocking/ugens/oscillators.js → ...src/lib/ext/flocking/ugens/oscillators.js b/public/src/lib/flocking/ugens/oscillators.js → ...src/lib/ext/flocking/ugens/oscillators.js
diff --git a/public/src/lib/flocking/ugens/scheduling.js → .../src/lib/ext/flocking/ugens/scheduling.js b/public/src/lib/flocking/ugens/scheduling.js → .../src/lib/ext/flocking/ugens/scheduling.js
diff --git a/public/src/lib/infusion/src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css b/public/src/lib/infusion/src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
@@ -822,7 +822,7 @@ body .ui-tooltip {
 .ui-state-default,
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
+	border: 1px solid #d3/d3d3;
 	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #555555;

diff --git a/public/src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/mist.css b/public/src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/mist.css
@@ -1,7 +1,7 @@
 /*! jQuery UI - v1.10.3 - 2013-10-21
 * http://jqueryui.com
 * Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=9dcaf6&bgTextureHeader=glass&bgImgOpacityHeader=75&borderColorHeader=5A95CF&fcHeader=222222&iconColorHeader=000000&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=cccccc&fcContent=222222&iconColorContent=222222&bgColorDefault=d9e8f7&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=9dcaf6&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=5A95CF&fcActive=000000&iconColorActive=454545&bgColorHighlight=9dcaf6&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=55&borderColorHighlight=2e83ff&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=inset_soft&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=2e83ff&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=20&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px&ctl=themeroller
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=9dcaf6&bgTextureHeader=glass&bgImgOpacityHeader=75&borderColorHeader=5A95CF&fcHeader=222222&iconColorHeader=000000&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=cccccc&fcContent=222222&iconColorContent=222222&bgColorDefault=d9e8f7&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3/d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=9dcaf6&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=5A95CF&fcActive=000000&iconColorActive=454545&bgColorHighlight=9dcaf6&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=55&borderColorHighlight=2e83ff&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=inset_soft&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=2e83ff&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=20&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px&ctl=themeroller
 * Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */
 
 /* Layout helpers
@@ -822,7 +822,7 @@ body .ui-tooltip {
 .fl-theme-mist .ui-state-default,
 .fl-theme-mist .ui-widget-content .ui-state-default,
 .fl-theme-mist .ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
+	border: 1px solid #d3/d3d3;
 	background: #d9e8f7 url(images/ui-bg_glass_75_d9e8f7_1x400.png) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #555555;

diff --git a/public/tests/html/chartAuthoring-Tests.html b/public/tests/html/chartAuthoring-Tests.html
@@ -9,14 +9,14 @@
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
 
-        <script src="../../src/lib/d3/d3.js"></script>
-
-        <script type="text/javascript" src="../../src/lib/flocking/flocking-base.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/oscillators.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/math.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/envelopes.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/midi.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/scheduling.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
+
+        <script type="text/javascript" src="../../src/lib/ext/flocking/flocking-base.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/oscillators.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/math.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/envelopes.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/midi.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/scheduling.js"></script>
 
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>

diff --git a/public/tests/html/d3Utils-Tests.html b/public/tests/html/d3Utils-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>

diff --git a/public/tests/html/d3ViewComponent-Tests.html b/public/tests/html/d3ViewComponent-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>

diff --git a/public/tests/html/legend-Tests.html b/public/tests/html/legend-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>

diff --git a/public/tests/html/pie-Tests.html b/public/tests/html/pie-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>

diff --git a/public/tests/html/pieChart-Tests.html b/public/tests/html/pieChart-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>

diff --git a/public/tests/html/sonifier-Tests.html b/public/tests/html/sonifier-Tests.html
@@ -8,14 +8,14 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
 
-        <script type="text/javascript" src="../../src/lib/flocking/flocking-base.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/oscillators.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/math.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/envelopes.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/midi.js"></script>
-        <script type="text/javascript" src="../../src/lib/flocking/ugens/scheduling.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/flocking-base.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/oscillators.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/math.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/envelopes.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/midi.js"></script>
+        <script type="text/javascript" src="../../src/lib/ext/flocking/ugens/scheduling.js"></script>
 
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>

diff --git a/public/tests/html/utils-Tests.html b/public/tests/html/utils-Tests.html
@@ -8,7 +8,7 @@
 
         <script src="../lib/infusion/lib/qunit/js/qunit.js"></script>
         <script src="../../src/lib/infusion/infusion-custom.js"></script>
-        <script src="../../src/lib/d3/d3.js"></script>
+        <script src="../../src/lib/ext/d3/d3.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../lib/infusion/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../lib/infusion/test-core/utils/js/IoCTestUtils.js"></script>