Skip to content

Commit

Permalink
Merge pull request #297 from OpenF2/release/1.4.4
Browse files Browse the repository at this point in the history 
1.4.4
  • Loading branch information
@brianbaker
brianbaker authored Jan 31, 2018
2 parents 9ba7ea1 + 120819a commit 1b55c9c
Show file tree
Hide file tree
Showing 34 changed files with 1,315 additions and 954 deletions.
6 changes: 3 additions & 3 deletions F2.latest.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-express');
grunt.loadNpmTasks('grunt-http');

grunt.registerTask('docs', ['http:getDocsLayout','generate-docs', 'yuidoc']);
grunt.registerTask('docs', ['http:getDocsLayout','generate-docs', /*'yuidoc'*/]);
grunt.registerTask('github-pages', ['copy:github-pages', 'clean:github-pages']);
grunt.registerTask('zip', ['compress', 'copy:F2-examples', 'clean:F2-examples']);
grunt.registerTask('js', ['concat:dist', 'concat:no-third-party', 'uglify:dist', 'sourcemap', 'copy:f2ToRoot', 'copy:f2Dist']);
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"markit f2"
],
"homepage": "http://www.openf2.org",
"version": "1.4.2",
"version": "1.4.4",
"main": "F2.latest.js",
"ignore": [
"**/.*",
Expand Down
51 changes: 26 additions & 25 deletions dist/f2.basic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@


/*!
* F2 v1.4.2 05-11-2017
* F2 v1.4.3 01-31-2018
* Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
*
* "F2" is licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1859,7 +1859,7 @@ F2 = (function() {
* @method version
* @return {string} F2 version number
*/
version: function() { return '1.4.2'; }
version: function() { return '1.4.3'; }
};
})();

Expand Down Expand Up @@ -2293,24 +2293,24 @@ F2.extend('Constants', {
{
return {
/**
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
APP_MANIFEST_REQUEST_FAIL: 'appManifestRequestFail',
/**
* Equivalent to `appCreateRoot`. Identifies the create root method for use in AppHandlers.on/off.
Expand Down Expand Up @@ -4581,8 +4581,9 @@ F2.extend('', (function() {
var _loadScripts = function(scripts, cb) {
// Reduce the list to scripts that haven't been loaded
var existingScripts = _findExistingScripts();
var loadingScripts = Object.keys(_loadingScripts);
scripts = jQuery.grep(scripts, function(url) {
return url && jQuery.inArray(url, existingScripts) === -1;
return url && (jQuery.inArray(url, existingScripts) === -1 || jQuery.inArray(url, loadingScripts) !== -1);
});

// Attempt to use the user provided method
Expand Down Expand Up @@ -5347,10 +5348,10 @@ F2.extend('', (function() {
item.name = item.name || item.appId;
F2.log('Removed failed ' + item.name + ' app', item);
F2.AppHandlers.__trigger(
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
F2.removeApp(item.instanceId);
});
},
Expand Down
6 changes: 3 additions & 3 deletions dist/f2.basic.min.js
View file

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions dist/f2.debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14768,7 +14768,7 @@ global.easyXDM = easyXDM;
})(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);

/*!
* F2 v1.4.2 05-11-2017
* F2 v1.4.3 01-31-2018
* Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
*
* "F2" is licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -15132,7 +15132,7 @@ F2 = (function() {
* @method version
* @return {string} F2 version number
*/
version: function() { return '1.4.2'; }
version: function() { return '1.4.3'; }
};
})();

Expand Down Expand Up @@ -15566,24 +15566,24 @@ F2.extend('Constants', {
{
return {
/**
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
APP_MANIFEST_REQUEST_FAIL: 'appManifestRequestFail',
/**
* Equivalent to `appCreateRoot`. Identifies the create root method for use in AppHandlers.on/off.
Expand Down Expand Up @@ -17854,8 +17854,9 @@ F2.extend('', (function() {
var _loadScripts = function(scripts, cb) {
// Reduce the list to scripts that haven't been loaded
var existingScripts = _findExistingScripts();
var loadingScripts = Object.keys(_loadingScripts);
scripts = jQuery.grep(scripts, function(url) {
return url && jQuery.inArray(url, existingScripts) === -1;
return url && (jQuery.inArray(url, existingScripts) === -1 || jQuery.inArray(url, loadingScripts) !== -1);
});

// Attempt to use the user provided method
Expand Down Expand Up @@ -18620,10 +18621,10 @@ F2.extend('', (function() {
item.name = item.name || item.appId;
F2.log('Removed failed ' + item.name + ' app', item);
F2.AppHandlers.__trigger(
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
F2.removeApp(item.instanceId);
});
},
Expand Down
6 changes: 3 additions & 3 deletions dist/f2.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/f2.min.map
View file

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions dist/f2.no-bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14431,7 +14431,7 @@ global.easyXDM = easyXDM;
})(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);

/*!
* F2 v1.4.2 05-11-2017
* F2 v1.4.3 01-31-2018
* Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
*
* "F2" is licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -14795,7 +14795,7 @@ F2 = (function() {
* @method version
* @return {string} F2 version number
*/
version: function() { return '1.4.2'; }
version: function() { return '1.4.3'; }
};
})();

Expand Down Expand Up @@ -15229,24 +15229,24 @@ F2.extend('Constants', {
{
return {
/**
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
APP_MANIFEST_REQUEST_FAIL: 'appManifestRequestFail',
/**
* Equivalent to `appCreateRoot`. Identifies the create root method for use in AppHandlers.on/off.
Expand Down Expand Up @@ -17517,8 +17517,9 @@ F2.extend('', (function() {
var _loadScripts = function(scripts, cb) {
// Reduce the list to scripts that haven't been loaded
var existingScripts = _findExistingScripts();
var loadingScripts = Object.keys(_loadingScripts);
scripts = jQuery.grep(scripts, function(url) {
return url && jQuery.inArray(url, existingScripts) === -1;
return url && (jQuery.inArray(url, existingScripts) === -1 || jQuery.inArray(url, loadingScripts) !== -1);
});

// Attempt to use the user provided method
Expand Down Expand Up @@ -18283,10 +18284,10 @@ F2.extend('', (function() {
item.name = item.name || item.appId;
F2.log('Removed failed ' + item.name + ' app', item);
F2.AppHandlers.__trigger(
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
F2.removeApp(item.instanceId);
});
},
Expand Down
6 changes: 3 additions & 3 deletions dist/f2.no-bootstrap.min.js
View file

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions dist/f2.no-easyXDM.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12183,7 +12183,7 @@ var $, jQuery = $ = window.jQuery.noConflict(true);


/*!
* F2 v1.4.2 05-11-2017
* F2 v1.4.3 01-31-2018
* Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
*
* "F2" is licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -12547,7 +12547,7 @@ F2 = (function() {
* @method version
* @return {string} F2 version number
*/
version: function() { return '1.4.2'; }
version: function() { return '1.4.3'; }
};
})();

Expand Down Expand Up @@ -12981,24 +12981,24 @@ F2.extend('Constants', {
{
return {
/**
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the
* following argument(s): ( {{#crossLink "F2.AppConfig"}}appConfig{{/crossLink}} )
* @property APP_MANIFEST_REQUEST_FAIL
* @type string
* @static
* @final
* @example
* var _token = F2.AppHandlers.getToken();
* F2.AppHandlers.on(
* _token,
* F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
* function(appConfig)
* {
* You can use information from the appConfig to surface a custom error message in the dom
* Or display some kind of default error placeholder element rather than having a blank spot in the dom
* }
* );
*/
APP_MANIFEST_REQUEST_FAIL: 'appManifestRequestFail',
/**
* Equivalent to `appCreateRoot`. Identifies the create root method for use in AppHandlers.on/off.
Expand Down Expand Up @@ -15269,8 +15269,9 @@ F2.extend('', (function() {
var _loadScripts = function(scripts, cb) {
// Reduce the list to scripts that haven't been loaded
var existingScripts = _findExistingScripts();
var loadingScripts = Object.keys(_loadingScripts);
scripts = jQuery.grep(scripts, function(url) {
return url && jQuery.inArray(url, existingScripts) === -1;
return url && (jQuery.inArray(url, existingScripts) === -1 || jQuery.inArray(url, loadingScripts) !== -1);
});

// Attempt to use the user provided method
Expand Down Expand Up @@ -16035,10 +16036,10 @@ F2.extend('', (function() {
item.name = item.name || item.appId;
F2.log('Removed failed ' + item.name + ' app', item);
F2.AppHandlers.__trigger(
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
_sAppHandlerToken,
F2.Constants.AppHandlers.APP_MANIFEST_REQUEST_FAIL,
item // the app config
);
F2.removeApp(item.instanceId);
});
},
Expand Down
Loading

0 comments on commit 1b55c9c

Please sign in to comment.