@@ -74,6 +74,7 @@ var $frameworkCustomURL = $("#framework-url-custom");
7474var $codeConsole = $ ( "#code-console" ) ;
7575var $apiOptions = $ ( "#api-options" ) ;
7676var $apiKey = $ ( "#api-key" ) ;
77+ var $apiAsync = $ ( "#api-async" ) ;
7778var $includeButtons = $ ( "#include-buttons" ) ;
7879
7980// a few global-esque vars */
@@ -82,7 +83,6 @@ var saved = {}; // use this to hold cookies/preferences
8283var tinyURLs = [ ] ; // URLs generated by bit.ly (reduce server hits)
8384var isCustomApiKey = false ;
8485
85-
8686// create editor
8787var $codeMirror = $ ( "#code-console" ) ;
8888var consoleEditor = {
@@ -166,6 +166,7 @@ function str_split(string, delimiter, limit) {
166166 * @param {Boolean } allowBadOnLoad should onLoad not be verified? (true when Run is executed)
167167 */
168168var parseOptions = function ( allowBadOnLoad ) {
169+ var async = $apiAsync . is ( ":checked" ) ;
169170 var options = $apiOptions . val ( ) ;
170171 var newOptions = "" ;
171172 var processed = [ ] ;
@@ -186,6 +187,7 @@ var parseOptions = function( allowBadOnLoad ) {
186187 $ . each ( options , function ( key , value ) {
187188 if ( value !== "" ) {
188189 var temp = str_split ( value . replace ( / \s + / g, "" ) , ":" , 2 ) ; // removes whitespace and splits into key:value pairs
190+ temp [ 1 ] = temp [ 1 ] . replace ( / " / g, '' ) ;
189191 var skip = false ;
190192 /*
191193 * These rules might be a bit confusing, priority matters
@@ -240,12 +242,20 @@ var parseOptions = function( allowBadOnLoad ) {
240242 else {
241243 if ( temp [ 0 ] === "api_key" ) {
242244 isCustomApiKey = true ;
245+ if ( temp [ 1 ] === "none" ) {
246+ skip = true ;
247+ }
243248 }
244249 processed [ temp [ 0 ] ] = true ;
245250 }
246251
247252 if ( ! skip ) {
248- newOptions += temp [ 0 ] + ": " + temp [ 1 ] + "\n" ;
253+ if ( async ) {
254+ newOptions += temp [ 0 ] + ": \"" + temp [ 1 ] + "\"\n" ;
255+ }
256+ else {
257+ newOptions += temp [ 0 ] + ": " + temp [ 1 ] + "\n" ;
258+ }
249259 }
250260 }
251261 } ) ;
@@ -262,21 +272,42 @@ var parseOptions = function( allowBadOnLoad ) {
262272 */
263273var cleanUpEnvironment = function ( dontHideTinyURL ) {
264274 // remove generated sandbox
265- $ ( "iframe" , "#sandbox" ) . remove ( ) ;
266-
275+ // $("iframe","#sandbox").remove();
276+ $sandbox . empty ( ) ;
267277 $tinyURLContainer . pulse ( { duration : "fast" } ) ;
268278
269279 // remove previous error messages
270280 removeAllErrorMessages ( ) ;
271281} ;
272282
273283
284+
285+ /**
286+ * helper function to prepend tabs to the parameters
287+ * makes it look prettier
288+ * @method formatParams
289+ * @param {String } params
290+ * @param {String } tabs
291+ */
292+ var formatParams = function ( params , tabs , jstring ) {
293+ params = params . split ( '\n' ) ;
294+ $ . each ( params , function ( i ) {
295+ if ( params [ i ] !== '' ) {
296+ params [ i ] = tabs + params [ i ] ;
297+ }
298+ } ) ;
299+ return params . join ( jstring ) ;
300+ } ;
301+
302+
303+
274304/**
275305 * helper function to execute the request
276306 * @method executeCode
277307 * @param {Boolean } allowBadOnLoad passed directly to parseOptions()
278308 */
279309var executeCode = function ( allowBadOnLoad ) {
310+ var async = $apiAsync . is ( ":checked" ) ;
280311 parseOptions ( allowBadOnLoad ) ; // ensure that option rules are enforced
281312
282313 // fix inconsistent loc.protocol (some browsers will return "http", others return "http:")
@@ -297,21 +328,32 @@ var executeCode = function( allowBadOnLoad ) {
297328 + '"framework":"' + $frameworkSelector . val ( ) + '",'
298329 + '"frameworkurl":"' + frameworkURL + '",'
299330 + '"apikey":"' + apiKey + '",'
300- + '"apioptions":"' + apiOptions . replace ( / \n / g, "\\n" ) + '",' // we need to escape newlines for valid JSON
301- + '"sessionbuttons":' + $includeButtons . is ( ":checked" ) // note: this is boolean, no quotes
331+ + '"apioptions":"' + apiOptions . replace ( / \n / g, "\\n" ) . replace ( / " / g, '' ) + '",' // we need to escape newlines and remove quotes for valid JSON
332+ + '"sessionbuttons":' + $includeButtons . is ( ":checked" ) + ',' // note: this is boolean, no quotes
333+ + '"async":' + async // note: this is boolean, no quotes
302334 + '}' ;
303335 // some API key magic
304336 if ( ( connectURL !== "custom" || frameworkURL === "" ) && ! isCustomApiKey ) {
305337 // default to the Connect API Key
306- apiKey = "api_key: " + CONNECT_API_KEY + "\n" ;
338+ if ( async ) {
339+ apiKey = "api_key: \"" + CONNECT_API_KEY + "\"\n" ;
340+ }
341+ else {
342+ apiKey = "api_key: " + CONNECT_API_KEY + "\n" ;
343+ }
307344 }
308345 else if ( isCustomApiKey ) {
309346 // API Key override (api_key was specified in params)
310347 apiKey = "" ;
311348 }
312349 else {
313350 //
314- apiKey = "api_key: " + apiKey + "\n" ;
351+ if ( async ) {
352+ apiKey = "api_key: \"" + apiKey + "\"\n" ;
353+ }
354+ else {
355+ apiKey = "api_key: " + apiKey + "\n" ;
356+ }
315357 }
316358
317359 var params = apiKey + apiOptions ;
@@ -384,26 +426,56 @@ var executeCode = function( allowBadOnLoad ) {
384426 }
385427 } ) ;
386428
429+
430+ var theScript = 'testing' ;
431+ var tabs = async ? ' ' : ' ' ;
432+ var jstring = async ? ',\n' : '\n' ;
433+ params = formatParams ( params , tabs , jstring ) ;
434+ if ( async ) {
435+ params = params . slice ( 0 , - 2 ) ; // remove last comma and linebreak
436+ }
437+ else {
438+ if ( async ) {
439+ params = params . slice ( 0 , - 1 ) ; // remove last comma
440+ }
441+ }
442+ if ( $includeButtons . is ( ":checked" ) ) {
443+ runCode += SESSION_BUTTON ;
444+ }
445+ // manipulate the code to load sync or async
446+ if ( async ) {
447+ theScript = [ '<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>' ,
448+ '<script type="text/javascript">' ,
449+ '$(function() {' ,
450+ ' $.getScript("' + connectURL + '?async=true", function success() {' ,
451+ ' IN.init({' ,
452+ params ,
453+ ' });' ,
454+ ' });' ,
455+ '});' ,
456+ '</script>' ] . join ( '\n' ) ;
457+ }
458+ else {
459+ theScript = [ '<script type="text/javascript" src="' + connectURL + '">' ,
460+ params ,
461+ '</script>' ] . join ( '\n' ) ;
462+ }
463+
387464 // build the sandbox iframe
388465 try {
389- if ( $includeButtons . is ( ":checked" ) ) {
390- runCode += SESSION_BUTTON ;
391- }
392466 // set a window function that will give us the HTML for the sandbox
393467 // it gets overwritten on each run
394468 window . getSandboxHtml = function getSandboxHtml ( ) {
395469 return [ '' ,
396- '<script type="text/javascript" src="' + connectURL + '">' ,
397- params ,
398- '</script>' ,
470+ theScript ,
399471 '\n' ,
400472 runCode ,
401473 '' ]
402474 . join ( "\n" ) ;
403475 } ;
404476 // append sandbox iframe
405477 // the sandbox will actually run the code
406- $sandbox . append ( '<iframe id="sandboxrunner" src="sandbox.html">' ) ;
478+ $ ( "# sandbox" ) . append ( '<iframe id="sandboxrunner" src="sandbox.html"/ >' ) ;
407479 }
408480 catch ( e ) {
409481 throwErrorMessage ( "error1003" , "Failed to inject Framework\n" + e ) ;
@@ -580,8 +652,7 @@ var throwErrorMessage = function( id, message, type ) {
580652 if ( type === "highlight" ) {
581653 errType = "Warning: " ;
582654 iconType = "info" ;
583- }
584- //console.log(errType+message);
655+ }
585656 $errorContainer . show ( "fast" ) ;
586657 if ( $errID . length > 0 ) {
587658 $ ( ".error-message" , $errID ) . html ( message ) ;
@@ -695,6 +766,9 @@ var restorePreferences = function( saved ) {
695766 if ( saved . sessionbuttons !== undef ) {
696767 $includeButtons . attr ( "checked" , saved . sessionbuttons ) ;
697768 }
769+ if ( saved . async !== undef ) {
770+ $apiAsync . attr ( "checked" , saved . async ) ;
771+ }
698772} ;
699773
700774// Actual Execution begins here
0 commit comments