entityjs 0.3.0 → 0.3.1

data/src/media/sound.js

@@ -58,8 +58,7 @@ re.sound = re.c('sound')
     
     this.trigger('sound:end');
     
-    this.currentTime = 0
-  }     
+  }
   
 })
 .defines({
@@ -71,21 +70,30 @@ re.sound = re.c('sound')
         var c = this._sound;
         var that = this;
         
-        c.currentTime = 0;
-        
-        if(!this.sound_e){
-          this.sound_e = true;
-          var f = function(){
+        if(window['soundManager']){
+          
+          c.play({onfinish:function(){
             that.sound_ended();
-            c.removeEventListener('ended', f);
-            that.sound_e = false;
-          };
+            }
+          });
           
-          c.addEventListener('ended', f, false);
+        } else {
+          c.currentTime = 0;
           
+          if(!this.sound_e){
+            this.sound_e = true;
+            var f = function(){
+              that.sound_ended();
+              c.removeEventListener('ended', f);
+              that.sound_e = false;
+            };
+            
+            c.addEventListener('ended', f, false);
+            
+          }
+          c.play();
         }
       
-        c.play();
         return this;
     },
     
@@ -101,14 +109,6 @@ re.sound = re.c('sound')
         this.playing = false;
         
         return this;
-    },
-    
-    currentTime:function(){
-        return this._sound.currentTime;
-    },
-    
-    ended:function(){
-        return this._sound.ended;
     }
     
 });

data/src/util/log.js

@@ -4,14 +4,6 @@ The log component definess a cross browser console.log command.
 re.log('example log');
 
 */
-re.log = function(){
-	try{
-		console.log.apply(console, arguments);
-	} catch(e){
-		try {
-			opera.postError.apply(opera, arguments);
-		} catch(e){
-			alert(Array.prototype.join.call(arguments, " "));
-		}
-	}
+re.log = function(m){
+  console.log(m);
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entityjs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15095820 !ruby/object:Gem::Requirement
+  requirement: &9272340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15095820
+  version_requirements: *9272340
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &15095400 !ruby/object:Gem::Requirement
+  requirement: &9271920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15095400
+  version_requirements: *9271920
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &15094980 !ruby/object:Gem::Requirement
+  requirement: &9271500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15094980
+  version_requirements: *9271500
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &15094560 !ruby/object:Gem::Requirement
+  requirement: &9271080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15094560
+  version_requirements: *9271080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15110500 !ruby/object:Gem::Requirement
+  requirement: &9270660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15110500
+  version_requirements: *9270660
 - !ruby/object:Gem::Dependency
   name: cobravsmongoose
-  requirement: &15110080 !ruby/object:Gem::Requirement
+  requirement: &9270240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,8 +76,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15110080
-description: The EntityJS gem supplies easy to use commands for creating javascript
+  version_requirements: *9270240
+description: HTML5 Javascript game engine, quickly create robust, flexible and reusable
   games.
 email:
 - ben@entityjs.com
@@ -100,6 +100,7 @@ files:
 - lib/entityjs/commands/comp.rb
 - lib/entityjs/commands/font.rb
 - lib/entityjs/commands/new.rb
+- lib/entityjs/commands/release.rb
 - lib/entityjs/commands/server.rb
 - lib/entityjs/commands/templates.rb
 - lib/entityjs/commands/test.rb
@@ -122,7 +123,12 @@ files:
 - spec/javascripts/helpers/canvas.js
 - spec/javascripts/helpers/entityunit.js
 - spec/javascripts/helpers/factories.js
+- spec/javascripts/helpers/flashcanvas.js~
 - spec/javascripts/helpers/jquery-1.7.1.min.js
+- spec/javascripts/helpers/soundmanager2/soundmanager2.js
+- spec/javascripts/helpers/soundmanager2/soundmanager2.js~
+- spec/javascripts/helpers/soundmanager2/soundmanager2.swf
+- spec/javascripts/helpers/soundmanager2/soundmanager2_debug.swf
 - spec/javascripts/src/core/comp_spec.js
 - spec/javascripts/src/core/entity_spec.js
 - spec/javascripts/src/core/load_spec.js
@@ -173,6 +179,7 @@ files:
 - spec/lib/entityjs/commands/comp_spec.rb
 - spec/lib/entityjs/commands/font_spec.rb
 - spec/lib/entityjs/commands/new_spec.rb
+- spec/lib/entityjs/commands/release_spec.rb
 - spec/lib/entityjs/commands/templates_spec.rb
 - spec/lib/entityjs/commands/test_spec.rb
 - spec/lib/entityjs/config_spec.rb