diff --git a/.npmignore b/.npmignore index 391683c3c9..44b36d50bd 100644 --- a/.npmignore +++ b/.npmignore @@ -1,31 +1,28 @@ .settings .project -src/WEB-INF +build-scripts +Gruntfile.js +products + src/components src/demos +src/framework/fss +src/framework/preferences +src/instructionalDemos src/integration-demos +src/lib/fonts +src/lib/jquery/plugins +src/lib/jquery/ui +src/lib/json src/standalone-demos -src/tests/3rd-party-tests + +src/tests/all-tests.html src/tests/component-tests src/tests/framework-tests -src/tests/manual-tests -src/tests/all-tests.html src/tests/lib/jquery-ui src/tests/lib/mockjax -src/tests/lib/README +src/tests/manual-tests src/tests/test-core/testTests -src/tests/test-core/utils/js/DebugFocus.js - -src/lib/jquery/plugins -src/lib/jquery/ui - -src/lib/json -src/framework/fss - -build-scripts -products -project.xml -project.properties -pom.xml +src/tests/test-core/utils/js/DebugFocus.js \ No newline at end of file diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 575dc20947..8c9396dd0a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,9 +1,13 @@ -# Release Notes for Fluid Infusion 1.5 # +# Release Notes for Fluid Infusion 1.5.1 # [Main Project Site](http://fluidproject.org) [Documentation](https://github.com/fluid-project/infusion-docs) +## What's New in 1.5.1? ## + +* Corrected .npmignore file + ## What's New in 1.5? ## * Preferences Framework diff --git a/package.json b/package.json index 7fb5061564..c1caf90456 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "infusion", "description": "Infusion is an application framework for developing flexible stuff with JavaScript.", - "version": "1.5.0", + "version": "1.5.1", "author": "Fluid Project", "bugs": "http://issues.fluidproject.org/browse/FLUID", "homepage": "http://www.fluidproject.org/", diff --git a/src/framework/core/js/Fluid.js b/src/framework/core/js/Fluid.js index 96dca7a71b..2211131554 100644 --- a/src/framework/core/js/Fluid.js +++ b/src/framework/core/js/Fluid.js @@ -32,7 +32,7 @@ var fluid = fluid || fluid_1_5; (function ($, fluid) { "use strict"; - fluid.version = "Infusion 1.5"; + fluid.version = "Infusion 1.5.1"; // Export this for use in environments like node.js, where it is useful for // configuring stack trace behaviour @@ -1698,7 +1698,7 @@ var fluid = fluid || fluid_1_5; // will THEN return to "evaluation of arguments" (expander blocks) and only then FINALLY to this "slow" // traversal of concrete properties to do the final merge. if (source !== undefined) { - // This use of function creation within a loop is acceptable since + // This use of function creation within a loop is acceptable since // the function does not attempt to close directly over the loop counter fluid.each(source, function (newSource, name) { if (!target.hasOwnProperty(name)) { // only request each new target key once -- all sources will be queried per strategy @@ -2215,14 +2215,14 @@ var fluid = fluid || fluid_1_5; fluid.fireEvent(that, "events.afterDestroy", [that, "", null]); }; }; - + /** Returns true if the supplied reference holds a component which has been destroyed **/ - + fluid.isDestroyed = function (that) { return that.destroy === fluid.destroyedMarker; }; - // unsupported, NON-API function + // unsupported, NON-API function fluid.doDestroy = function (that, name, parent) { fluid.fireEvent(that, "events.onDestroy", [that, name || "", parent]); that.destroy = fluid.destroyedMarker;