Submovie urls

src/bootstrapper/context/iframe/bootstrap.js

@@ -29,13 +29,22 @@ define([
     var globalExports = iframeWindow.exports = {}; // for plugins
 
     // As per the boostrap's contract, it must provide stage.loadSubMovie
-    stage.loadSubMovie = function(movieUrl, callback, movieInstance) {
+    stage.loadSubMovie = function(movieUrl, assetUrl, callback, movieInstance) {
+
+      if (arguments.length < 4) {
+        movieInstance = callback;
+        callback = assetUrl;
+        assetUrl = null;
+      }
+
+      movieUrl = this.assetBaseUrl.resolveUri(movieUrl);
+      assetUrl = assetUrl ? movieUrl.resolveUri(assetUrl) : movieUrl;
 
       var iframe = doc.createElement('iframe');
       doc.documentElement.appendChild(iframe);
       var subWindow = iframe.contentWindow;
       var subMovie = movieInstance || new env.Movie();
-      var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl);
+      var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl, assetUrl);
 
       // Need to call open()/close() before exposing anything on the window
       // (Opera would initiate a separate script context if we did it after)

src/bootstrapper/context/node/context.js

@@ -93,11 +93,19 @@ requirejs.requirejs([
     initStage: function(stage) {
       var context = this;
       var env = stage.env;
-      stage.loadSubMovie = function(movieUrl, callback, movieInstance) {
+      stage.loadSubMovie = function(movieUrl, assetUrl, callback, movieInstance) {
+
+        if (arguments.length < 4) {
+          movieInstance = callback;
+          callback = assetUrl;
+          assetUrl = null;
+        }
+
         movieUrl = this.assetBaseUrl.resolveUri(movieUrl);
+        assetUrl = assetUrl ? movieUrl.resolveUri(assetUrl) : movieUrl;
 
         var subMovie = movieInstance || new env.Movie();
-        var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl);
+        var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl, assetUrl);
         var subEnvExports = subEnvironment.exports;
         var functionArgNames = [];
         var functionArgValues = [];

src/bootstrapper/context/worker/bootstrap.js

@@ -82,12 +82,19 @@ define([
     });
 
     // As per the boostrap's contract, it must provide stage.loadSubMovie
-    stage.loadSubMovie = function(movieUrl, callback, movieInstance) {
+    stage.loadSubMovie = function(movieUrl, assetUrl, callback, movieInstance) {
+
+      if (arguments.length < 4) {
+        movieInstance = callback;
+        callback = assetUrl;
+        assetUrl = null;
+      }
 
       movieUrl = this.assetBaseUrl.resolveUri(movieUrl);
+      assetUrl = assetUrl ? movieUrl.resolveUri(assetUrl) : movieUrl;
 
       var subMovie = movieInstance || new env.Movie();
-      var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl);
+      var subEnvironment = stage.getSubMovieEnvironment(subMovie, movieUrl, assetUrl);
       var subEnvExports = subEnvironment.exports;
       var functionArgNames = [];
       var functionArgValues = [];

src/runner/environment.js

@@ -100,7 +100,7 @@ define([
     exports.KeyframeAnimation = bindConstructorToParameters(KeyframeAnimation, [stage]);
     exports.Bitmap = bindConstructorToParameters(Bitmap, [assetLoader]);
     exports.FontFamily = bindConstructorToParameters(FontFamily, [assetLoader]);
-    exports.Movie = bindConstructorToParameters(Movie, [stage]);
+    exports.Movie = bindConstructorToParameters(Movie, [stage, null]);
     exports.Sprite = bindConstructorToParameters(Sprite, [assetLoader]);
     exports.Video = bindConstructorToParameters(Video, [assetLoader]);
     exports.Audio = bindConstructorToParameters(Audio, [assetLoader]);

src/runner/movie.js

@@ -23,7 +23,13 @@ define([
    * @mixes Timeline
    * @mixes displayList.timelineMethods
    */
-  function Movie(root, url, callback, displayList) {
+  function Movie(root, displayList, url, assetUrl, callback) {
+
+    if (arguments.length === 4 && typeof assetUrl === 'function') {
+      callback = assetUrl;
+      assetUrl = null;
+    }
+
     AssetDisplayObject.call(this, null, url, callback);
 
     if (!displayList) {
@@ -35,7 +41,7 @@ define([
     this.root = root;
     var me = this;
     if (url) {
-      root.loadSubMovie(url, function(err) {
+      root.loadSubMovie(url, assetUrl, function(err) {
         // We trigger the event asynchronously so as to ensure that any events
         // bound after instantiation are still triggered:
         if (err) {

src/runner/stage.js

@@ -229,14 +229,13 @@ define([
      * @private
      * @returns {Environment} The Submovie Environment
      */
-    getSubMovieEnvironment: function(subMovie, subMovieUrl) {
+    getSubMovieEnvironment: function(subMovie, subMovieUrl, assetUrl) {
       subMovieUrl = this.assetBaseUrl.resolveUri(subMovieUrl);
       subMovie.url = subMovieUrl.toString();
-      var assetBase = subMovieUrl.scheme === 'data' ? null : subMovieUrl;
       return new Environment(
         subMovie,
         new AssetLoader(this.registry.pendingAssets)
-          .on('request', hitch(this, this.loadAsset, assetBase))
+          .on('request', hitch(this, this.loadAsset, assetUrl.scheme === 'data' ? null : assetUrl))
       );
     },
 

test/movie-spec.js

@@ -8,7 +8,7 @@ define([
   describe('Movie', function() {
 
     testDisplayList(function(displayList) {
-      return new Movie({}, null, null, displayList);
+      return new Movie({}, displayList, null, null, null);
     });
 
     it('Sets its root to first argument [usually bound by environment.js]', function() {
@@ -23,8 +23,8 @@ define([
       };
       var url = 'http://abc.def/pa/t/h.js';
       var callback = function() {};
-      var m = new Movie(root, url, callback);
-      expect(root.loadSubMovie).toHaveBeenCalled();
+      var m = new Movie(root, null, url, callback);
+      expect(root.loadSubMovie.mostRecentCall.args[0]).toBe(url);
     });
 
     testLifeCycle(function() { return new Movie({}); });

test/stage-spec.js

@@ -57,7 +57,8 @@ define([
       it('returns an Environment instance for a new subMovie', function() {
         var subMovie = {};
         var subMovieUrl = 'test/123.js';
-        var env = makeStage().getSubMovieEnvironment(subMovie, subMovieUrl);
+        var assetUrl = 'arbitrary/assets'
+        var env = makeStage().getSubMovieEnvironment(subMovie, subMovieUrl, assetUrl);
         expect(env instanceof Environment).toBe(true);
         expect(env.exports.stage).toBe(subMovie);
       });