Merge pull request #289 from OpenF2/1.4.3-wip

Version 1.4.3

Gruntfile.js

@@ -124,7 +124,7 @@ module.exports = function(grunt) {
 			dist: {
 				src: [
 					'sdk/src/template/header.js.tmpl',
-					'sdk/src/third-party/json2.js',
+					'sdk/src/third-party/json3.js',
 					'sdk/src/third-party/jquery.js',
 					'sdk/src/third-party/jquery.noconflict.js',
 					'sdk/src/third-party/bootstrap-modal.js',
@@ -146,7 +146,7 @@ module.exports = function(grunt) {
 			'no-jquery-or-bootstrap': {
 				src: [
 					'sdk/src/template/header.js.tmpl',
-					'sdk/src/third-party/json2.js',
+					'sdk/src/third-party/json3.js',
 					'sdk/src/third-party/eventemitter2.js',
 					'sdk/src/third-party/easyXDM/easyXDM.js',
 					'<%= jshint.files %>',
@@ -157,7 +157,7 @@ module.exports = function(grunt) {
 			'no-bootstrap': {
 				src: [
 					'sdk/src/template/header.js.tmpl',
-					'sdk/src/third-party/json2.js',
+					'sdk/src/third-party/json3.js',
 					'sdk/src/third-party/jquery.js',
 					'sdk/src/third-party/jquery.noconflict.js',
 					'sdk/src/third-party/eventemitter2.js',
@@ -170,7 +170,7 @@ module.exports = function(grunt) {
 			'no-easyXDM': {
 				src: [
 					'sdk/src/template/header.js.tmpl',
-					'sdk/src/third-party/json2.js',
+					'sdk/src/third-party/json3.js',
 					'sdk/src/third-party/jquery.js',
 					'sdk/src/third-party/bootstrap-modal.js',
 					'sdk/src/third-party/jquery.noconflict.js',
@@ -183,7 +183,7 @@ module.exports = function(grunt) {
 			'basic': { //reminiscent of F2 1.0, no secure apps and Container Provide must have jQuery & Bootstrap on page before F2.
 				src: [
 					'sdk/src/template/header.js.tmpl',
-					'sdk/src/third-party/json2.js',
+					'sdk/src/third-party/json3.js',
 					'sdk/src/third-party/eventemitter2.js',
 					'<%= jshint.files %>',
 					'sdk/src/template/footer.js.tmpl'

dist/f2.no-third-party.js

@@ -5,7 +5,7 @@
 	}
 
 /*!
- * F2 v1.4.2 06-20-2016
+ * F2 v1.4.2 05-11-2017
  * Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
  *
  * "F2" is licensed under the Apache License, Version 2.0 (the "License"); 
@@ -416,6 +416,7 @@ F2.extend('AppHandlers', (function() {
 	var _f2t = F2.guid();
 
 	var _handlerCollection = {
+		appManifestRequestFail: [],
 		appCreateRoot: [],
 		appRenderBefore: [],			
 		appDestroyBefore: [],
@@ -801,6 +802,26 @@ F2.extend('Constants', {
 	AppHandlers: (function()
 	{
 		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
+ 			*		}
+ 			*	);
+ 			*/
+			APP_MANIFEST_REQUEST_FAIL: 'appManifestRequestFail',
 			/**
 			* Equivalent to `appCreateRoot`. Identifies the create root method for use in AppHandlers.on/off. 
 			* When bound using {{#crossLink "F2.AppHandlers/on"}}F2.AppHandlers.on(){{/crossLink}} the listener function passed will receive the 
@@ -3835,6 +3856,11 @@ F2.extend('', (function() {
 								jQuery.each(req.apps, function(idx, item) {
 									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
+ 									);
 									F2.removeApp(item.instanceId);
 								});
 							},

docs/dist/container-development.html

@@ -677,6 +677,7 @@ <h3 class="link-header" id="default-app-layout">Default App Layout<a class="anch
 <p>Appending apps to the <code>&lt;body&gt;</code> is the default app rendering behavior of F2.</p>
 <h3 class="link-header" id="custom-app-layout">Custom App Layout<a class="anchor" href="#custom-app-layout"><span>#</span></a></h3><p>F2 <code>AppHandlers</code> provide event handlers for customized app layout using <code>F2.AppHandlers.on()</code> and <code>F2.AppHandlers.off()</code>. The use of <code>on</code> and <code>off</code> require both a <a href="#apphandler-tokens">token</a> and an event type as arguments. The event types, defined as constants in <code>F2.Constants.AppHandlers</code>, are: </p>
 <ul>
+<li><code>appManifestRequestFail</code></li>
 <li><code>appCreateRoot</code></li>
 <li><code>appDestroy</code></li>
 <li><code>appDestroyAfter</code></li>

docs/dist/extending-f2.html

@@ -165,7 +165,7 @@ <h2 class="link-header" id="best-practices">Best Practices<a class="anchor" href
 </ul>
 <hr>
 <h2 class="link-header" id="forum">Forum<a class="anchor" href="#forum"><span>#</span></a></h2><p>Have a question? Ask it on the <a href="https://groups.google.com/forum/#!forum/OpenF2">F2 Google Group</a>.</p>
-<p><a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#x4f;&#112;&#101;&#110;&#x46;&#x32;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#112;&#x73;&#46;&#x63;&#x6f;&#109;">&#x4f;&#112;&#101;&#110;&#x46;&#x32;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#112;&#x73;&#46;&#x63;&#x6f;&#109;</a></p>
+<p><a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#79;&#x70;&#x65;&#x6e;&#x46;&#50;&#64;&#103;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#x2e;&#x63;&#111;&#x6d;">&#79;&#x70;&#x65;&#x6e;&#x46;&#50;&#64;&#103;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#x2e;&#x63;&#111;&#x6d;</a></p>
 <hr>
 
       </div>

docs/dist/f2js-sdk.html

@@ -187,7 +187,7 @@ <h2 class="link-header" id="upgrading">Upgrading<a class="anchor" href="#upgradi
 <p>A download (<a href="https://github.com/OpenF2/F2/zipball/master">zip</a>) of the current version (1.4.2) of F2 is always available along with <a href="https://github.com/OpenF2/F2/releases">tags of previous releases</a>.</p>
 <h3 class="link-header" id="deprecated-features">Deprecated Features<a class="anchor" href="#deprecated-features"><span>#</span></a></h3><p>There is a page on the wiki <a href="https://github.com/OpenF2/F2/wiki/F2.js-Deprecated">tracking deprecated features in F2</a>. Starting with version 1.2, three <code>ContainerConfig</code> properties have been retired. As F2 features and/or F2.js APIs are deprecated, we will attempt to give reasonable advance notice via any or all of the F2 <a href="https://github.com/OpenF2/F2/blob/master/CONTRIBUTING.md#keep-in-touch">communication channels</a>. In addition, we will strive to ensure that backward compatibility will be maintained for at least one major version of F2. For example, if <code>Feature X</code> is deprecated in version <code>1.3</code>, we will attempt to maintain backward compatibility until the next major release (version <code>2.0</code>). F2 documentation will be updated accordingly to reflect any changes, and the conversation behind deprecated features will be publicly <a href="https://github.com/OpenF2/F2/issues">available on GitHub</a>.</p>
 <h3 class="link-header" id="third-party-libraries">Third Party Libraries<a class="anchor" href="#third-party-libraries"><span>#</span></a></h3><p>F2 uses third party libraries inside F2.js (see <a href="http://docs.openf2.org/#choices">Framework: Choices</a>). These open-source libraries are all on their own release schedules. We cannot guarantee that we will always stay abreast and in tune with such latest releases, but in an effort to improve the F2 framework, we will attempt to update F2.js so that it uses the latest, most stable and most secure version of the third party software. These updates to F2 will be made through the normal release process on GitHub and comments will be open.</p>
-<h2 class="link-header" id="issues-enhancements-bugs">Issues, Enhancements, Bugs<a class="anchor" href="#issues-enhancements-bugs"><span>#</span></a></h2><p>Have a question? Ask it on the <a href="https://groups.google.com/forum/#!forum/OpenF2">F2 Google Group</a> (or send an email to <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#79;&#112;&#x65;&#110;&#70;&#x32;&#64;&#x67;&#111;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#x63;&#111;&#109;">&#79;&#112;&#x65;&#110;&#70;&#x32;&#64;&#x67;&#111;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#x63;&#111;&#109;</a>) or start a discussion using <a href="https://github.com/OpenF2/F2/issues">Issues on GitHub</a>. </p>
+<h2 class="link-header" id="issues-enhancements-bugs">Issues, Enhancements, Bugs<a class="anchor" href="#issues-enhancements-bugs"><span>#</span></a></h2><p>Have a question? Ask it on the <a href="https://groups.google.com/forum/#!forum/OpenF2">F2 Google Group</a> (or send an email to <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#58;&#79;&#112;&#101;&#x6e;&#70;&#50;&#x40;&#x67;&#111;&#111;&#103;&#x6c;&#x65;&#103;&#114;&#111;&#117;&#112;&#115;&#46;&#99;&#x6f;&#109;">&#79;&#112;&#101;&#x6e;&#70;&#50;&#x40;&#x67;&#111;&#111;&#103;&#x6c;&#x65;&#103;&#114;&#111;&#117;&#112;&#115;&#46;&#99;&#x6f;&#109;</a>) or start a discussion using <a href="https://github.com/OpenF2/F2/issues">Issues on GitHub</a>. </p>
 <p>To track bugs, enhancements or other issues, F2 is using <a href="https://github.com/OpenF2/F2/issues">Issues on GitHub</a>.</p>
 <hr>
 <h2 class="link-header" id="license">License<a class="anchor" href="#license"><span>#</span></a></h2><p>F2 is licensed under the Apache License version 2.0. Details are available in the <a href="https://github.com/OpenF2/F2#copyright-and-license">project readme</a>.</p>

docs/dist/sdk/classes/F2.AppHandlers.html

@@ -508,7 +508,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l205"><code>sdk\src\app_handlers.js:205</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l206"><code>sdk\src\app_handlers.js:206</code></a>
 
         </p>
 
@@ -585,7 +585,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l220"><code>sdk\src\app_handlers.js:220</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l221"><code>sdk\src\app_handlers.js:221</code></a>
 
         </p>
 
@@ -680,7 +680,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l191"><code>sdk\src\app_handlers.js:191</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l192"><code>sdk\src\app_handlers.js:192</code></a>
 
         </p>
 
@@ -755,7 +755,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l373"><code>sdk\src\app_handlers.js:373</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l374"><code>sdk\src\app_handlers.js:374</code></a>
 
         </p>
 
@@ -886,7 +886,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l288"><code>sdk\src\app_handlers.js:288</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l289"><code>sdk\src\app_handlers.js:289</code></a>
 
         </p>
 
@@ -1043,7 +1043,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l313"><code>sdk\src\app_handlers.js:313</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l314"><code>sdk\src\app_handlers.js:314</code></a>
 
         </p>
 

docs/dist/sdk/classes/F2.Constants.AppHandlers.html

@@ -211,7 +211,7 @@ <h1 class="page-header">F2.Constants.AppHandlers <small>Class</small></h1>
 
 
         <div class="foundat">
-            Defined in: <a href="../files/sdk_src_app_handlers.js.html#l422"><code>sdk\src\app_handlers.js:422</code></a>
+            Defined in: <a href="../files/sdk_src_app_handlers.js.html#l423"><code>sdk\src\app_handlers.js:423</code></a>
         </div>
 
 
@@ -306,6 +306,19 @@ <h3>Properties</h3>
 </td>
                             </tr>
 
+                            <tr class="index-item property">
+                                <td class="name">
+                                    <a href="#" data-tabid="#properties" data-anchor="#property_APP_MANIFEST_REQUEST_FAIL" data-tablink="APP_MANIFEST_REQUEST_FAIL">APP_MANIFEST_REQUEST_FAIL</a>
+
+                                        <span class="label label-default static">static</span>
+
+
+                                </td>
+                                <td><p>When bound using <a href="../classes/F2.AppHandlers.html#method_on" class="crosslink">F2.AppHandlers.on()</a> the listener function passed will receive the 
+following argument(s): ( <a href="../classes/F2.AppConfig.html" class="crosslink">appConfig</a> )</p>
+</td>
+                            </tr>
+
                             <tr class="index-item property">
                                 <td class="name">
                                     <a href="#" data-tabid="#properties" data-anchor="#property_APP_RENDER" data-tablink="APP_RENDER">APP_RENDER</a>
@@ -409,7 +422,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l429"><code>sdk\src\app_handlers.js:429</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l450"><code>sdk\src\app_handlers.js:450</code></a>
 
         </p>
 
@@ -483,7 +496,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l550"><code>sdk\src\app_handlers.js:550</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l571"><code>sdk\src\app_handlers.js:571</code></a>
 
         </p>
 
@@ -568,7 +581,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l583"><code>sdk\src\app_handlers.js:583</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l604"><code>sdk\src\app_handlers.js:604</code></a>
 
         </p>
 
@@ -640,7 +653,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l530"><code>sdk\src\app_handlers.js:530</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l551"><code>sdk\src\app_handlers.js:551</code></a>
 
         </p>
 
@@ -678,6 +691,78 @@ <h4>Example:</h4>
 
 
 
+    <hr>
+</div>
+
+
+                    <div id="property_APP_MANIFEST_REQUEST_FAIL" class="property item">
+    <h3>
+        APP_MANIFEST_REQUEST_FAIL
+
+        <span class="label type">String</span>
+
+
+
+
+
+
+            <span class="label label-default final">final</span>
+
+
+
+            <span class="label label-default static">static</span>
+
+    </h3>
+
+    <div class="meta">
+
+
+
+                <p>
+
+                Defined in
+
+
+
+
+        <a href="../files/sdk_src_app_handlers.js.html#l430"><code>sdk\src\app_handlers.js:430</code></a>
+
+        </p>
+
+
+
+
+    </div>
+
+    <div class="description">
+        <p>When bound using <a href="../classes/F2.AppHandlers.html#method_on" class="crosslink">F2.AppHandlers.on()</a> the listener function passed will receive the 
+following argument(s): ( <a href="../classes/F2.AppConfig.html" class="crosslink">appConfig</a> )</p>
+
+    </div>
+
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>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
+    }
+);</code></pre>
+
+            </div>
+        </div>
+
+
+
     <hr>
 </div>
 
@@ -712,7 +797,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l471"><code>sdk\src\app_handlers.js:471</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l492"><code>sdk\src\app_handlers.js:492</code></a>
 
         </p>
 
@@ -803,7 +888,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l510"><code>sdk\src\app_handlers.js:510</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l531"><code>sdk\src\app_handlers.js:531</code></a>
 
         </p>
 
@@ -875,7 +960,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l451"><code>sdk\src\app_handlers.js:451</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l472"><code>sdk\src\app_handlers.js:472</code></a>
 
         </p>
 
@@ -947,7 +1032,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_app_handlers.js.html#l603"><code>sdk\src\app_handlers.js:603</code></a>
+        <a href="../files/sdk_src_app_handlers.js.html#l624"><code>sdk\src\app_handlers.js:624</code></a>
 
         </p>
 

docs/dist/sdk/classes/F2.html

@@ -4659,7 +4659,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_container.js.html#l1202"><code>sdk\src\container.js:1202</code></a>
+        <a href="../files/sdk_src_container.js.html#l1207"><code>sdk\src\container.js:1207</code></a>
 
         </p>
 
@@ -4724,7 +4724,7 @@ <h3>
 
 
 
-        <a href="../files/sdk_src_container.js.html#l1217"><code>sdk\src\container.js:1217</code></a>
+        <a href="../files/sdk_src_container.js.html#l1222"><code>sdk\src\container.js:1222</code></a>
 
         </p>