### Eclipse Workspace Patch 1.0 #P incubarot Index: engage-sketches/trunk/src/webapp/mapping/js/mapping.js =================================================================== --- engage-sketches/trunk/src/webapp/mapping/js/mapping.js (revision 8232) +++ engage-sketches/trunk/src/webapp/mapping/js/mapping.js (working copy) @@ -12,10 +12,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_1 = fluid_1_1 || {}; -var fluid = fluid || fluid_1_1; +var fluid = fluid || {}; (function ($, fluid) { fluid.mapping = fluid.mapping || {}; @@ -291,4 +290,4 @@ } -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettleDemo/js/kettleCherryDemo.js =================================================================== --- engage-sketches/trunk/src/webapp/kettleDemo/js/kettleCherryDemo.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettleDemo/js/kettleCherryDemo.js (working copy) @@ -12,10 +12,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +var fluid = fluid || {}; (function ($, fluid) { fluid.kettleDemo = fluid.kettleDemo || {}; @@ -51,4 +50,4 @@ return app.app; } -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/artifactDemo/js/artifactDemo.js =================================================================== --- engage-sketches/trunk/src/webapp/artifactDemo/js/artifactDemo.js (revision 8232) +++ engage-sketches/trunk/src/webapp/artifactDemo/js/artifactDemo.js (working copy) @@ -11,10 +11,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +var fluid = fluid || {}; (function ($, fluid) { @@ -82,4 +81,4 @@ return app.app; }; -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettleDemo/js/kettleJSGIDemo.js =================================================================== --- engage-sketches/trunk/src/webapp/kettleDemo/js/kettleJSGIDemo.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettleDemo/js/kettleJSGIDemo.js (working copy) @@ -12,10 +12,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +var fluid = fluid || {}; (function ($, fluid) { fluid.kettleDemo = fluid.kettleDemo || {}; @@ -24,4 +23,4 @@ return [200,{"Content-Type":"text/plain"}, "THE KETTOL HAS LANDED!" ]; } -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: custom-build/trunk/js/customBuild.js =================================================================== --- custom-build/trunk/js/customBuild.js (revision 8232) +++ custom-build/trunk/js/customBuild.js (working copy) @@ -10,9 +10,9 @@ */ /*global jQuery*/ -/*global fluid_1_2*/ +/*global fluid_1_1*/ -fluid_1_2 = fluid_1_2 || {}; +fluid_1_1 = fluid_1_1 || {}; (function ($, fluid) { @@ -617,4 +617,4 @@ markSelection: fluid.customBuild.updateItemAndDependencies, unmarkSelection: fluid.customBuild.updateItemAndDependencies }); -})(jQuery, fluid_1_2); +})(jQuery, fluid_1_1); Index: engage-client/trunk/components/screenNavigator/js/ScreenNavigator.js =================================================================== --- engage-client/trunk/components/screenNavigator/js/ScreenNavigator.js (revision 8232) +++ engage-client/trunk/components/screenNavigator/js/ScreenNavigator.js (working copy) @@ -1,6 +1,6 @@ -/*global fluid_1_2, jQuery, window*/ +/*global fluid, jQuery, window*/ -var fluid_1_2 = fluid_1_2 || {}; +var fluid = fluid || {}; (function ($, fluid) { /* @@ -322,4 +322,4 @@ viewFetcher: fluid.screenNavigator.ajaxViewFetcher }); -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/browseDemo/js/browseDemo.js =================================================================== --- engage-sketches/trunk/src/webapp/browseDemo/js/browseDemo.js (revision 8232) +++ engage-sketches/trunk/src/webapp/browseDemo/js/browseDemo.js (working copy) @@ -10,10 +10,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +var fluid = fluid || {}; (function ($, fluid) { @@ -149,4 +148,4 @@ return app.app; }; -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-client/trunk/components/browse/js/Browse.js =================================================================== --- engage-client/trunk/components/browse/js/Browse.js (revision 8232) +++ engage-client/trunk/components/browse/js/Browse.js (working copy) @@ -9,9 +9,9 @@ https://source.fluidproject.org/svn/LICENSE.txt */ -/*global jQuery, fluid_1_2*/ +/*global jQuery, fluid*/ -fluid_1_2 = fluid_1_2 || {}; +fluid = fluid || {}; (function ($, fluid) { @@ -263,4 +263,4 @@ ] }); -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-client/trunk/components/artifact/js/loadData.js =================================================================== --- engage-client/trunk/components/artifact/js/loadData.js (revision 8232) +++ engage-client/trunk/components/artifact/js/loadData.js (working copy) @@ -12,8 +12,7 @@ /*global jQuery*/ /*global fluid*/ -fluid_1_2 = fluid_1_2 || {}; -fluid = fluid || fluid_1_2; +fluid = fluid || {}; var demo = demo || {}; @@ -38,4 +37,4 @@ } }; -}(jQuery, fluid_1_2)); \ No newline at end of file +}(jQuery, fluid)); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettle/js/servletJSGI.js =================================================================== --- engage-sketches/trunk/src/webapp/kettle/js/servletJSGI.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettle/js/servletJSGI.js (working copy) @@ -20,9 +20,11 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; + +/*global jQuery, fluid*/ +var fluid = fluid || {}; + // Adapted from JackJS' servlet.js "handler" - original comment: @@ -84,5 +86,5 @@ Packages.org.fluidproject.kettle.ResourceUtil.sendResponse(response, body); } -})(jQuery, fluid_1_2); +})(jQuery, fluid); Index: engage-client/trunk/components/browse/js/NavigationList.js =================================================================== --- engage-client/trunk/components/browse/js/NavigationList.js (revision 8232) +++ engage-client/trunk/components/browse/js/NavigationList.js (working copy) @@ -10,9 +10,9 @@ https://source.fluidproject.org/svn/LICENSE.txt */ -/*global jQuery, fluid, fluid_1_2*/ +/*global jQuery, fluid*/ -fluid_1_2 = fluid_1_2 || {}; +fluid = fluid || {}; (function ($, fluid) { @@ -201,4 +201,4 @@ } ); -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettle/js/contentTypes.js =================================================================== --- engage-sketches/trunk/src/webapp/kettle/js/contentTypes.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettle/js/contentTypes.js (working copy) @@ -10,8 +10,9 @@ https://source.fluidproject.org/svn/LICENSE.txt */ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +/*global jQuery, fluid*/ + +var fluid = fluid || {}; (function ($, fluid) { fluid.kettle = fluid.kettle || {}; @@ -74,5 +75,5 @@ contentTypeHeader: "text/css; charset=UTF-8", } } -})(jQuery, fluid_1_2); +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettle/js/env2.js =================================================================== --- engage-sketches/trunk/src/webapp/kettle/js/env2.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettle/js/env2.js (working copy) @@ -11,8 +11,9 @@ https://source.fluidproject.org/svn/LICENSE.txt */ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +/*global jQuery, fluid*/ + +var fluid = fluid || {}; (function ($, fluid) { @@ -41,5 +42,5 @@ }; $.ajaxSettings.async = false; -})(jQuery, fluid_1_2); +})(jQuery, fluid); \ No newline at end of file Index: engage-client/trunk/framework/js/Engage.js =================================================================== --- engage-client/trunk/framework/js/Engage.js (revision 8232) +++ engage-client/trunk/framework/js/Engage.js (working copy) @@ -10,10 +10,9 @@ */ // Declare dependencies. -/*global jQuery*/ +/*global jQuery, fluid*/ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +var fluid = fluid || {}; (function ($, fluid) { @@ -137,4 +136,4 @@ return normalizedModel; }; -})(jQuery, fluid_1_2); \ No newline at end of file +})(jQuery, fluid); \ No newline at end of file Index: engage-sketches/trunk/src/webapp/kettle/js/kettle.js =================================================================== --- engage-sketches/trunk/src/webapp/kettle/js/kettle.js (revision 8232) +++ engage-sketches/trunk/src/webapp/kettle/js/kettle.js (working copy) @@ -10,8 +10,9 @@ https://source.fluidproject.org/svn/LICENSE.txt */ -var fluid_1_2 = fluid_1_2 || {}; -var fluid = fluid || fluid_1_2; +/*global jQuery, fluid*/ + +var fluid = fluid || {}; (function ($, fluid) { fluid.kettle = fluid.kettle || {}; @@ -253,5 +254,5 @@ return that; }; -})(jQuery, fluid_1_2); +})(jQuery, fluid); \ No newline at end of file Index: engage-client/trunk/components/artifact/js/artifact.js =================================================================== --- engage-client/trunk/components/artifact/js/artifact.js (revision 8232) +++ engage-client/trunk/components/artifact/js/artifact.js (working copy) @@ -10,10 +10,9 @@ */ /*global jQuery*/ -/*global fluid_1_2 fluid*/ +/*global fluid*/ -fluid_1_2 = fluid_1_2 || {}; -fluid = fluid || fluid_1_2; +fluid = fluid || {}; (function ($, fluid) { @@ -203,4 +202,4 @@ } }); -}(jQuery, fluid_1_2)); +}(jQuery, fluid));