merging + linting

dist/LASTBUILD

@@ -1 +1 @@
-2012/11/08 12:18
+2012/11/08 12:49

dist/miso.storyboard.0.0.1.js

@@ -350,7 +350,9 @@
           sceneName = sceneName ? sceneName.name : '';
 
           this.publish(name, fromScene, toScene);
-          this.publish(sceneName + ":" + name);
+          if (name !== 'start' || name !== 'end') {
+            this.publish(sceneName + ":" + name);
+          }
 
         }, this),
         bailout = _.bind(function() {

dist/miso.storyboard.deps.0.0.1.js

@@ -5249,7 +5249,9 @@
           sceneName = sceneName ? sceneName.name : '';
 
           this.publish(name, fromScene, toScene);
-          this.publish(sceneName + ":" + name);
+          if (name !== 'start' || name !== 'end') {
+            this.publish(sceneName + ":" + name);
+          }
 
         }, this),
         bailout = _.bind(function() {

dist/miso.storyboard.r.0.0.1.js

@@ -358,7 +358,9 @@
           sceneName = sceneName ? sceneName.name : '';
 
           this.publish(name, fromScene, toScene);
-          this.publish(sceneName + ":" + name);
+          if (name !== 'start' || name !== 'end') {
+            this.publish(sceneName + ":" + name);
+          }
 
         }, this),
         bailout = _.bind(function() {

dist/node/miso.scene.0.0.1.js

@@ -353,7 +353,9 @@ _.mixin(require("underscore.deferred"));
           sceneName = sceneName ? sceneName.name : '';
 
           this.publish(name, fromScene, toScene);
-          this.publish(sceneName + ":" + name);
+          if (name !== 'start' || name !== 'end') {
+            this.publish(sceneName + ":" + name);
+          }
 
         }, this),
         bailout = _.bind(function() {

src/storyboard.js

@@ -233,7 +233,9 @@
           sceneName = sceneName ? sceneName.name : '';
 
           this.publish(name, fromScene, toScene);
-          this.publish(sceneName + ":" + name);
+          if (name !== 'start' || name !== 'end') {
+            this.publish(sceneName + ":" + name);
+          }
 
         }, this),
         bailout = _.bind(function() {

test/unit/base.js

@@ -87,7 +87,6 @@ test("Cloning deeply", function() {
       a : new Miso.Storyboard({
         enter : function() {
           this.counter = 0;
-          console.log('a', this._id);
         },
         exit : function() {
           this.helper();
@@ -117,7 +116,6 @@ test("Cloning deeply", function() {
     },
 
     helper : function() {
-      console.log('parent.helper', this._id, this.counter);
       this.counter += 10;
     }
   });

test/unit/scene_events.js

@@ -4,65 +4,73 @@ module("Storyboard Event Integration");
 
 test("Basic transition events", function() {
 
-  var baseEvents = [
+  var events = [
     'start',
+    'x:unloaded:enter',
     'enter',
+    'unloaded:enter',
     'end',
     'start',
+    'x:unloaded:exit',
     'exit',
+    'unloaded:exit',
+    'x:loaded:enter',
     'enter',
+    'loaded:enter',
     'end',
     'start',
+    'x:loaded:exit',
     'exit',
-    'enter',
-    'end'
-  ], baseEventsActual = [];
-
-  var sceneEvents = [
-    'unloaded:start',
-    'unloaded:enter',
-    'unloaded:end',
-    'loaded:start',
-    'unloaded:exit',
-    'loaded:enter',
-    'loaded:end',
-    'ending:start',
     'loaded:exit',
+    'x:ending:enter',
+    'enter',
     'ending:enter',
-    'ending:end'
-  ], sceneEventsActual = []; 
+    'end'
+  ], actualEvents = [];
 
   var app = new Miso.Storyboard({
     initial : 'unloaded',
     scenes : {
-      unloaded : {},
-      loaded : {},
-      ending : {}
+      unloaded : {
+        enter : function() {
+          actualEvents.push("x:unloaded:enter");
+        }, 
+        exit : function() {
+          actualEvents.push("x:unloaded:exit");
+        }
+      },
+      loaded : {
+        enter : function() {
+          actualEvents.push("x:loaded:enter");
+        }, 
+        exit : function() {
+          actualEvents.push("x:loaded:exit");
+        }
+      },
+      ending : {
+        enter : function() {
+          actualEvents.push("x:ending:enter");
+        }
+      }
     }
   });
 
-  var events = [
-    'unloaded:start', 'unloaded:enter', 'unloaded:exit', 'unloaded:end',
-    'loaded:start', 'loaded:enter', 'loaded:exit', 'loaded:end',
-    'ending:start', 'ending:enter', 'ending:exit', 'ending:end'
+  var eventList = [
+    'start','exit','enter','end',
+    'unloaded:enter', 'unloaded:exit',
+    'loaded:enter', 'loaded:exit',
+    'ending:enter', 'ending:exit'
   ];
-  _.each(events, function(event) {
-    app.subscribe(event, function() {
-      sceneEventsActual.push(event);
-    });
-  });
-
-  _.each(['start','exit','enter','end'], function(event) {
+  _.each(eventList, function(event) {
     app.subscribe(event, function() {
-      baseEventsActual.push(event);
+      actualEvents.push(event);
     });
   });
 
   app.start().then(function() {
     app.to('loaded').then(function() {
       app.to('ending').then(function() {
-        ok(_.isEqual(sceneEvents, sceneEventsActual), sceneEventsActual);
-        ok(_.isEqual(baseEvents, baseEventsActual), baseEventsActual);
+        ok(_.isEqual(actualEvents, events), actualEvents);
       });
     });
   });