Merge remote-tracking branch 'jobara/FLUID-5786'

* jobara/FLUID-5786:
  FLUID-5786: renamed versioned namespace
  FLUID-5786: Correct fluid.version number
  FLUID-5786: Changing SNAPSHOT to dev

.jshintrc

@@ -28,6 +28,7 @@
     "worker": true,
 
     "globals": {
-        "fluid_2_0": true
+        "fluid_2_0_0_beta_1": true,
+        "JSON": false
     }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "infusion",
   "description": "Infusion is an application framework for developing flexible stuff with JavaScript.",
-  "version": "2.0.0-SNAPSHOT",
+  "version": "2.0.0-dev",
   "author": "Fluid Project",
   "bugs": "http://issues.fluidproject.org/browse/FLUID",
   "homepage": "http://www.fluidproject.org/",

src/components/inlineEdit/js/InlineEdit.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -968,10 +968,10 @@ var fluid_2_0 = fluid_2_0 || {};
             editables: ".flc-inlineEditable"
         }
     });
-    
+
     fluid.inlineEdits = function (container, options) {
         var that = fluid.inlineEditsComponent(container, options);
         return that.inlineEdits;
     };
-    
-})(jQuery, fluid_2_0);
+
+})(jQuery, fluid_2_0_0_beta_1);

src/components/inlineEdit/js/InlineEditIntegrations.js

@@ -13,7 +13,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
 /* global CKEDITOR, tinyMCE */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -421,4 +421,4 @@ var fluid_2_0 = fluid_2_0 || {};
         blurHandlerBinder: fluid.inlineEdit.dropdown.blurHandlerBinder,
         editModeRenderer: fluid.inlineEdit.dropdown.editModeRenderer
     });
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/overviewPanel/js/OverviewPanel.js

@@ -10,7 +10,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
 
@@ -195,4 +195,4 @@ var fluid_2_0 = fluid_2_0 || {};
         }
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/pager/js/PagedTable.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -129,4 +129,4 @@ var fluid_2_0 = fluid_2_0 || {};
     });
 
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/pager/js/Pager.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -553,4 +553,4 @@ var fluid_2_0 = fluid_2_0 || {};
         }
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/pager/js/Table.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -436,4 +436,4 @@ var fluid_2_0 = fluid_2_0 || {};
         columnDefs: [] // [{key: "columnName", valuebinding: "*.valuePath", sortable: true/false}]
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/progress/js/Progress.js

@@ -11,7 +11,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -266,4 +266,4 @@ var fluid_2_0 = fluid_2_0 || {};
         updatePosition: false
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/GeometricManager.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -639,4 +639,4 @@ var fluid_2_0 = fluid_2_0 || {};
         }
         return togo;
     };
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/ImageReorderer.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -146,4 +146,4 @@ var fluid_2_0 = fluid_2_0 || {};
     fluid.lightbox = fluid.reorderImages;
 
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/LayoutReorderer.js

@@ -10,7 +10,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -33,4 +33,4 @@ var fluid_2_0 = fluid_2_0 || {};
         var options = $.extend(true, assembleOptions, userOptions);
         return fluid.reorderer(container, options);
     };
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/ModuleLayout.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -302,4 +302,4 @@ var fluid_2_0 = fluid_2_0 || {};
     };
 
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/Reorderer.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -961,4 +961,4 @@ var fluid_2_0 = fluid_2_0 || {};
         };
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/reorderer/js/ReordererDOMUtilities.js

@@ -10,7 +10,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -90,4 +90,4 @@ var fluid_2_0 = fluid_2_0 || {};
             ((node.nodeType === 3) && fluid.dom.isWhitespaceNode(node)); // a text node, all ws
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/slidingPanel/js/SlidingPanel.js

@@ -10,7 +10,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -112,4 +112,4 @@ var fluid_2_0 = fluid_2_0 || {};
         that.events[that.model.isShowing ? "onPanelShow" : "onPanelHide"].fire();
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/tableOfContents/js/TableOfContents.js

@@ -10,7 +10,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -397,4 +397,4 @@ var fluid_2_0 = fluid_2_0 || {};
 
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/tabs/js/Tabs.js

@@ -11,7 +11,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -51,4 +51,4 @@ var fluid_2_0 = fluid_2_0 || {};
         });
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/textToSpeech/js/TextToSpeech.js

@@ -11,7 +11,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
 /* global speechSynthesis, SpeechSynthesisUtterance*/
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -205,4 +205,4 @@ var fluid_2_0 = fluid_2_0 || {};
         speechSynthesis.cancel();
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/textfieldSlider/js/TextfieldSlider.js

@@ -9,7 +9,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -180,4 +180,4 @@ var fluid_2_0 = fluid_2_0 || {};
         return $.extend(true, {}, sliderOptions, model, range);
     };
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/tooltip/js/Tooltip.js

@@ -9,7 +9,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -213,4 +213,4 @@ var fluid_2_0 = fluid_2_0 || {};
         delay: 300
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/uiOptions/js/UIOptions.js

@@ -9,7 +9,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 (function ($, fluid) {
     "use strict";
 
@@ -38,4 +38,4 @@ var fluid_2_0 = fluid_2_0 || {};
         }
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/undo/js/Undo.js

@@ -11,7 +11,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -181,4 +181,4 @@ var fluid_2_0 = fluid_2_0 || {};
         gradeNames: ["fluid.undo"]
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/uploader/js/DemoUploadManager.js

@@ -12,7 +12,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -138,4 +138,4 @@ var fluid_2_0 = fluid_2_0 || {};
         }
     });
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/uploader/js/ErrorPanel.js

@@ -9,7 +9,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -231,4 +231,4 @@ var fluid_2_0 = fluid_2_0 || {};
     };
 
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);

src/components/uploader/js/FileQueue.js

@@ -11,7 +11,7 @@ You may obtain a copy of the ECL 2.0 License and BSD License at
 https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
-var fluid_2_0 = fluid_2_0 || {};
+var fluid_2_0_0_beta_1 = fluid_2_0_0_beta_1 || {};
 
 (function ($, fluid) {
     "use strict";
@@ -193,4 +193,4 @@ var fluid_2_0 = fluid_2_0 || {};
     };
 
 
-})(jQuery, fluid_2_0);
+})(jQuery, fluid_2_0_0_beta_1);