in prep for changing imagebox collection format

cashmusic · Aug 16, 2010 · 3f48288 · 3f48288
1 parent beb4a47
commit 3f48288
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/uncompressed/media/flower_imagebox.js b/uncompressed/media/flower_imagebox.js
@@ -160,7 +160,7 @@ var FlowerImagebox = new Class({
 				var divCollection = 'default',
 					elid = el.get('id');
 				if (elid) {divCollection = elid;}
-				el.getElements('a[href*=.jpg],a[href*=.jpeg],a[href*=.gif],a[href*=.png]').each(function(a){	
+				el.getElements('a[href*=.jpg],a[href*=.jpeg],a[href*=.gif],a[href*=.png]').each(function(a){
 					this.addFromLink(a,divCollection);
 				}.bind(this));
 			}

diff --git a/uncompressed/soundplayer/flower_soundplayer.js b/uncompressed/soundplayer/flower_soundplayer.js
@@ -38,7 +38,7 @@ var FlowerSoundPlayer = new Class({
 		this.sm2Loaded = false;
 		this.currentSound = null;
 		this.currentPlaylist = null;
-		this.Playlists = new Hash();
+		this.Playlists = $H();
 		this.soundManager = null;
 		this.sm2LoadTimer = null;
 		this.sm2LoadTime = 0;
@@ -90,21 +90,6 @@ var FlowerSoundPlayer = new Class({
 		soundManager.beginDelayedInit(); // start SM2 init.
 	},
 
-
-
-
-	/*
-	*
-	*
-	*
-	*
-	Taken directly from imagebox
-	*
-	*
-	*
-	*
-	*/
-
 	attachToElement: function(el) {
 		/*
 		Function attachToElement(anchor element el)
@@ -456,7 +441,7 @@ var SoundPlaylist = new Class({
 
 	initialize: function(name) {
 		this.SoundPlayer = null;
-		this.sounds = new Hash();	
+		this.sounds = $H();	
 		this.currentSound = null;
 		this.currentKey = 0;
 		this.usingHTML5 = false;
@@ -629,15 +614,7 @@ var SoundPlaylist = new Class({
 	stopCurrentSound: function() {
 		this.makeCurrent();
 		if (this.currentSound.sound.playState != 0) {
-			/*
-			this.currentSound.sound.setPosition(0);
-			if (this.currentSound.sound.isHTML5) {
-				// HTML5 has no true "stop" — unloading the media can cause warnings that confuse and bewilder the iphone
-				this.currentSound.sound.pause();
-			} else {
-			*/
-				this.currentSound.sound.stop();
-			//}
+			this.currentSound.sound.stop();
 			this.SoundPlayer.fireEvent('stop');
 		}
 	},
@@ -763,7 +740,7 @@ var defaultSoundPlayerUI = new Class({
 		if (this.options.forceAppleiDevice) {
 			this.isAppleiDevice = true;
 		}
-		this.allPlaylistLi = new Hash();
+		this.allPlaylistLi = $H();
 		this.notesSpan = new Element('span',{
 			text:'(tap to stop)',
 			'styles':{'display':'none','color':'#111','padding-left':'1em'}
@@ -775,7 +752,7 @@ var defaultSoundPlayerUI = new Class({
 		// positionStyle - the position indicator
 		// controlsStyle - the div containing control buttons
 		//
-		this.elementStyles = new Hash({
+		this.elementStyles = $H({
 			'seekbarSpc': {'position':'relative','background-color':'#666','height':'9px','width':'100%','margin-top':'4px','overflow':'hidden'},
 			'seekbar': {'position':'absolute','background-color':'#c00','height':'9px','width':'0%','cursor':'pointer','z-index':'10'},
 			'position': {'position':'absolute','left':'0%','width':'3px','height':'9px','background-color':'#000','z-index':'15'},
@@ -873,7 +850,7 @@ var defaultSoundPlayerUI = new Class({
 				tmpLi.addEvent('click', function(){
 		        	this.handlePlaylistLiClick(track.sound.url);
 		        }.bind(this));
-				this.allPlaylistLi.set(track.sound.url,new Hash({'li':tmpLi,'titlespan':tmpTitleSpan,'timespan':tmpTimeSpan}));
+				this.allPlaylistLi.set(track.sound.url,$H({'li':tmpLi,'titlespan':tmpTitleSpan,'timespan':tmpTimeSpan}));
 			},this);
 
 			this.mainPlaylistOl.inject(this.playerSpc);