Skip to content
This repository
Browse code

version numbers, minor tweaks, cleanup

  • Loading branch information...
commit 2616691a9c220782791c0b594f4a83550af3915c 1 parent 3f0783d
Jesse von Doom authored August 16, 2010
5  LICENSE
... ...
@@ -1,4 +1,7 @@
1  
-Copyright (c) 2009, CASH Music
  1
+Flower
  2
+http://cashmusic.org/tools/
  3
+
  4
+Copyright (c) 2010, CASH Music
2 5
 All rights reserved.
3 6
 
4 7
 Redistribution and use in source and binary forms, with or without modification, 
8  README
... ...
@@ -1,8 +0,0 @@
1  
-These scripts are in-use throughout cashmusic.org, but need tweaks and
2  
-updates before being released publicly. The general idea is that there's
3  
-a single master JS object that serves as namespace and controller for
4  
-any number of smaller script modules. It also launches external scripts
5  
-as needed, and can auto-attach behaviors to elements. 
6  
-
7  
-The 1.0 version of Flower will focus on SoundPlayer, adding HTML5 
8  
-capabilities and more flexible playlist and event functionality. 
3  README.md
Source Rendered
... ...
@@ -0,0 +1,3 @@
  1
+Flower
  2
+http://cashmusic.org/tools/
  3
+
8  uncompressed/soundplayer/flower_soundplayer.js
@@ -498,7 +498,7 @@ var SoundPlaylist = new Class({
498 498
 				id: theSound.url, 
499 499
 				url: theSound.url,
500 500
 				onfinish: function() {
501  
-					this.SoundPlayer.fireEvent('stop');
  501
+					this.SoundPlayer.fireEvent('stop',this.currentSound.sound.url);
502 502
 					this.playSound('next');
503 503
 				}.bind(this),
504 504
 				whileplaying: function() {
@@ -599,7 +599,7 @@ var SoundPlaylist = new Class({
599 599
 		this.makeCurrent();
600 600
 		if (this.currentSound.sound.paused) {
601 601
 			this.currentSound.sound.resume();
602  
-			this.SoundPlayer.fireEvent('resume');
  602
+			this.SoundPlayer.fireEvent('resume',this.currentSound.sound.url);
603 603
 		}
604 604
 	},
605 605
 	
@@ -618,7 +618,7 @@ var SoundPlaylist = new Class({
618 618
 		this.makeCurrent();
619 619
 		if (this.currentSound.sound.playState == 1) {
620 620
 			this.currentSound.sound.pause();
621  
-			this.SoundPlayer.fireEvent('pause');
  621
+			this.SoundPlayer.fireEvent('pause',this.currentSound.sound.url);
622 622
 		}
623 623
 	},
624 624
 	
@@ -626,7 +626,7 @@ var SoundPlaylist = new Class({
626 626
 		this.makeCurrent();
627 627
 		if (this.currentSound.sound.playState != 0) {
628 628
 			this.currentSound.sound.stop();
629  
-			this.SoundPlayer.fireEvent('stop');
  629
+			this.SoundPlayer.fireEvent('stop',this.currentSound.sound.url);
630 630
 		}
631 631
 	},
632 632
 	

0 notes on commit 2616691

Please sign in to comment.
Something went wrong with that request. Please try again.