diff --git a/dist/angularAMD.js b/dist/angularAMD.js index 56bd9a4..608c0c5 100644 --- a/dist/angularAMD.js +++ b/dist/angularAMD.js @@ -95,6 +95,11 @@ define(function () { }; window.angular = alt_angular; + + if (require.defined('angular')) { + require.undef('angular'); + define('angular', [], alt_angular); + } } // Constructor @@ -147,7 +152,10 @@ define(function () { var resolve = config.resolve || {}; resolve['__AAMDCtrl'] = ['$q', '$rootScope', function ($q, $rootScope) { // jshint ignore:line var defer = $q.defer(); - require([load_controller], function (ctrl) { + if (typeof load_controller.push == "undefined") { + load_controller = [load_controller]; + } + require(load_controller, function (ctrl) { defer.resolve(ctrl); $rootScope.$apply(); }); @@ -189,15 +197,16 @@ define(function () { if (typeof alt_angular === 'undefined') { throw new Error('Alternate angular not set. Make sure that `enable_ngload` option has been set when calling angularAMD.bootstrap'); } - + // Process alternate queue in FIFO fashion function processRunBlock(block) { //console.info('"' + item.name + '": executing run block: ', run_block); run_injector.invoke(block); } - while (alternate_queue.length) { - var item = alternate_queue.shift(), + // Process the config blocks + for (var i=0;i0){for(var k=0;k0){for(var k=0;k