From 874e9fd42bff4b91e9f6c929482489b27452d0f2 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Tue, 30 Jul 2013 12:28:38 +0200 Subject: [PATCH] changed sandbox.html to load three js files for require as well --- src/sandbox.html | 4 ++- src/sandbox.js | 84 +++++++++++++++++++++++------------------------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/sandbox.html b/src/sandbox.html index b09b744..d4c1f79 100644 --- a/src/sandbox.html +++ b/src/sandbox.html @@ -8,7 +8,9 @@ - + + + diff --git a/src/sandbox.js b/src/sandbox.js index e6479bd..eb703d3 100644 --- a/src/sandbox.js +++ b/src/sandbox.js @@ -1,54 +1,50 @@ -require(['require-config'], function() { +require(['jquery', 'backbone', 'js/app-router', + 'js/app-config' +], function($, Backbone, Router, app) { 'use strict'; - // Start the main app logic. - require(['jquery', 'backbone', 'js/app-router', - 'js/app-config' - ], function($, Backbone, Router, app) { + var router, + mainWindow, + mainWindowOrigin; - var router, - mainWindow, - mainWindowOrigin; + /** + * Load templates and start the application + */ + $(document).ready(function() { + console.log('sandbox loaded'); - /** - * Load templates and start the application - */ - $(document).ready(function() { - console.log('sandbox loaded'); + // set listener for event from main window + window.onmessage = function(e) { + if (e.data.cmd === 'init') { + app.util.tpl.templates = e.data.args; - // set listener for event from main window - window.onmessage = function(e) { - if (e.data.cmd === 'init') { - app.util.tpl.templates = e.data.args; + // remember references to main window + mainWindow = e.source; + mainWindowOrigin = e.origin; - // remember references to main window - mainWindow = e.source; - mainWindowOrigin = e.origin; + // start backone.js router + router = new Router(); + Backbone.history.start(); + } + }; + }); - // start backone.js router - router = new Router(); - Backbone.history.start(); - } - }; - }); - - /** - * Helper method to ease message posting between sandbox and main window - */ - app.util.postMessage = function(cmd, args, callback) { - // set listender - window.onmessage = function(e) { - if (e.data.cmd === cmd) { - callback(e.data.args); - } - }; - - // send message to main window - mainWindow.postMessage({ - cmd: cmd, - args: args - }, mainWindowOrigin); + /** + * Helper method to ease message posting between sandbox and main window + */ + app.util.postMessage = function(cmd, args, callback) { + // set listender + window.onmessage = function(e) { + if (e.data.cmd === cmd) { + callback(e.data.args); + } }; - }); + // send message to main window + mainWindow.postMessage({ + cmd: cmd, + args: args + }, mainWindowOrigin); + }; + }); \ No newline at end of file