Permalink
Browse files

1. Fixed waitForMedia bug

2. Updated r.js and require.js
3. Fixed build system for previewer by renaming previewer.js to main.js
  • Loading branch information...
1 parent a323366 commit 47c77fe5394ca490491c481c8acaea358ec08a78 @secretrobotron committed Dec 7, 2011

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -37,8 +37,8 @@
// butter.js references butter-src in a document.write string, so it will
// not be found by the AST analysis done in the optimizer.
include: [
- 'butter.previewer.js',
- 'previewer.js'
+ 'butter.previewer',
+ 'main'
],
// Wraps the built file in a closure and exports butter as a global.
@@ -39,7 +39,7 @@
// Paths are relative to baseUrl; Notice the commas!
'}' +
'});' +
- 'ctx(["previewer/previewer"])' +
+ 'ctx(["previewer/main"])' +
'})()' +
'</script>');
}
File renamed without changes.
@@ -234,9 +234,8 @@
butter.unlisten( "trackeventupdated", onTrackEventUpdated );
}; //destroy
- this.waitForMedia = function( e ) {
- var mediaId = e.media.id;
- server.send( "link", mediaId, "waitformedia" );
+ this.waitForMedia = function( media ) {
+ server.send( "link", media.id, "waitformedia" );
}; //waitForMedia
Object.defineProperty( this, "type", {
Oops, something went wrong.

0 comments on commit 47c77fe

Please sign in to comment.