Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FLUID-5458 (for the 1.5.x branch) #540

Open
wants to merge 3 commits into
base: infusion-1.5.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down
10 changes: 5 additions & 5 deletions src/framework/core/js/Fluid.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2215,14 +2215,14 @@ var fluid = fluid || fluid_1_5;
fluid.fireEvent(that, "events.afterDestroy", [that, "", null]);
};
};

/** Returns <code>true</code> 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;
Expand Down