Skip to content

Adding resource constants #227

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.

Sign up for GitHub

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

Merged
markhealey merged 3 commits into from
Apr 2, 2015
Merged

Adding resource constants #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc82a4d
Adding event constants
Jan 20, 2015
c837177
Adding compiled files
Jan 20, 2015
13f3009
Use new constant in place of string, #222
Jan 20, 2015
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
6 changes: 3 additions & 3 deletions F2.latest.js
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 23 additions & 3 deletions sdk/f2.debug.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14269,7 +14269,7 @@ global.easyXDM = easyXDM;
})(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);

/*!
* F2 v1.4.0 12-30-2014
* F2 v1.4.0 01-19-2015
* 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 @@ -15915,6 +15915,15 @@ F2.extend('Constants', {
var _CONTAINER_EVENT_PREFIX = 'Container.';

return {
/**
* The APP_SCRIPTS_LOADED event is fired when all the scripts defined in
* the AppManifest have been loaded.
* @property APP_SCRIPTS_LOADED
* @type string
* @static
* @final
*/
APP_SCRIPTS_LOADED: _APP_EVENT_PREFIX + 'scriptsLoaded',
/**
* The APP\_SYMBOL\_CHANGE event is fired when the symbol is changed in an
* app. It is up to the app developer to fire this event.
Expand Down Expand Up @@ -15978,7 +15987,17 @@ F2.extend('Constants', {
* @static
* @final
*/
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange'
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange',
/**
* The RESOURCE_FAILED_TO_LOAD event will be fired by the container when
* it fails to load a script or style.
* @property RESOURCE_FAILED_TO_LOAD
* @depreciated since 1.4
* @type string
* @static
* @final
*/
RESOURCE_FAILED_TO_LOAD: _CONTAINER_EVENT_PREFIX + 'resourceFailedToLoad'
};
})(),

Expand Down Expand Up @@ -16102,6 +16121,7 @@ F2.extend('Constants', {
SETTINGS: 'settings'
}
});

/**
* Handles [Context](../../app-development.html#context) passing from
* containers to apps and apps to apps.
Expand Down Expand Up @@ -17345,7 +17365,7 @@ F2.extend('', (function() {
// Send error to console
F2.log('Script defined in \'' + evtData.appId + '\' failed to load \'' + evtData.src + '\'');

// Emit events
// TODO: depreciate
F2.Events.emit('RESOURCE_FAILED_TO_LOAD', evtData);

if (!_bUsesAppHandlers) {
Expand Down
6 changes: 3 additions & 3 deletions sdk/f2.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/f2.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 23 additions & 3 deletions sdk/f2.no-third-party.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

/*!
* F2 v1.4.0 12-30-2014
* F2 v1.4.0 01-19-2015
* 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 @@ -1651,6 +1651,15 @@ F2.extend('Constants', {
var _CONTAINER_EVENT_PREFIX = 'Container.';

return {
/**
* The APP_SCRIPTS_LOADED event is fired when all the scripts defined in
* the AppManifest have been loaded.
* @property APP_SCRIPTS_LOADED
* @type string
* @static
* @final
*/
APP_SCRIPTS_LOADED: _APP_EVENT_PREFIX + 'scriptsLoaded',
/**
* The APP\_SYMBOL\_CHANGE event is fired when the symbol is changed in an
* app. It is up to the app developer to fire this event.
Expand Down Expand Up @@ -1714,7 +1723,17 @@ F2.extend('Constants', {
* @static
* @final
*/
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange'
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange',
/**
* The RESOURCE_FAILED_TO_LOAD event will be fired by the container when
* it fails to load a script or style.
* @property RESOURCE_FAILED_TO_LOAD
* @depreciated since 1.4
* @type string
* @static
* @final
*/
RESOURCE_FAILED_TO_LOAD: _CONTAINER_EVENT_PREFIX + 'resourceFailedToLoad'
};
})(),

Expand Down Expand Up @@ -1838,6 +1857,7 @@ F2.extend('Constants', {
SETTINGS: 'settings'
}
});

/**
* Handles [Context](../../app-development.html#context) passing from
* containers to apps and apps to apps.
Expand Down Expand Up @@ -3081,7 +3101,7 @@ F2.extend('', (function() {
// Send error to console
F2.log('Script defined in \'' + evtData.appId + '\' failed to load \'' + evtData.src + '\'');

// Emit events
// TODO: depreciate
F2.Events.emit('RESOURCE_FAILED_TO_LOAD', evtData);

if (!_bUsesAppHandlers) {
Expand Down
23 changes: 21 additions & 2 deletions sdk/src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ F2.extend('Constants', {
var _CONTAINER_EVENT_PREFIX = 'Container.';

return {
/**
* The APP_SCRIPTS_LOADED event is fired when all the scripts defined in
* the AppManifest have been loaded.
* @property APP_SCRIPTS_LOADED
* @type string
* @static
* @final
*/
APP_SCRIPTS_LOADED: _APP_EVENT_PREFIX + 'scriptsLoaded',
/**
* The APP\_SYMBOL\_CHANGE event is fired when the symbol is changed in an
* app. It is up to the app developer to fire this event.
Expand Down Expand Up @@ -166,7 +175,17 @@ F2.extend('Constants', {
* @static
* @final
*/
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange'
CONTAINER_LOCALE_CHANGE: _CONTAINER_EVENT_PREFIX + 'localeChange',
/**
* The RESOURCE_FAILED_TO_LOAD event will be fired by the container when
* it fails to load a script or style.
* @property RESOURCE_FAILED_TO_LOAD
* @depreciated since 1.4
* @type string
* @static
* @final
*/
RESOURCE_FAILED_TO_LOAD: _CONTAINER_EVENT_PREFIX + 'resourceFailedToLoad'
};
})(),

Expand Down Expand Up @@ -289,4 +308,4 @@ F2.extend('Constants', {
*/
SETTINGS: 'settings'
}
});
});
4 changes: 2 additions & 2 deletions sdk/src/container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ F2.extend('', (function() {
// Send error to console
F2.log('Script defined in \'' + evtData.appId + '\' failed to load \'' + evtData.src + '\'');

// Emit events
F2.Events.emit('RESOURCE_FAILED_TO_LOAD', evtData);
// TODO: deprecate, see #222
F2.Events.emit(F2.Constants.Events.RESOURCE_FAILED_TO_LOAD, evtData);

if (!_bUsesAppHandlers) {
_appScriptLoadFailed(appConfigs[0], evtData.src);
Expand Down