Fixed naming and a couple of bugs in the Media framework

sproutit · Sep 8, 2010 · 4afd3ec · 4afd3ec
1 parent 637dc82
commit 4afd3ec
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/frameworks/media/views/audio.js b/frameworks/media/views/audio.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 
 sc_require('views/controls');
-sc_require('views/miniControls');
+sc_require('views/mini_controls');
 /** 
   @class
   
@@ -178,7 +178,10 @@ SC.AudioView = SC.View.extend({
           return;
         case "flash":
           var flashURL= sc_static('videoCanvas.swf');
+
           var movieURL = this.get('value');
+          if (!movieURL) return;
+
           if(movieURL.indexOf('http:')==-1){
             movieURL=location.protocol+'//'+location.host+movieURL;
           }

diff --git a/frameworks/media/views/controls.js b/frameworks/media/views/controls.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)
@@ -43,7 +43,7 @@ SC.MediaControlsView = SC.View.extend({
     renderStyle: 'renderImage',
     theme: ''
   }),
-  progressView: SC.mediaSlider.design({
+  progressView: SC.MediaSlider.design({
     layout: { top: 0, left: 20, right: 220, height:20},
     value:0,
     minimum: 0,
@@ -74,7 +74,7 @@ SC.MediaControlsView = SC.View.extend({
     value: '',
     icon: 'minus'
   }),
-  volumeView: SC.mediaSlider.design({
+  volumeView: SC.MediaSlider.design({
     layout: { top: 0, right: 20, width: 100, height:20},
     value:0,
     valueBinding: "*owner.target.volume" ,

diff --git a/frameworks/media/views/mediaSlider.js → frameworks/media/views/media_slider.js b/frameworks/media/views/mediaSlider.js → frameworks/media/views/media_slider.js
@@ -12,7 +12,7 @@
 
   @extends SC.View
 */
-SC.mediaSlider = SC.SliderView.extend({
+SC.MediaSlider = SC.SliderView.extend({
 
   mediaView: null,
 

diff --git a/frameworks/media/views/miniControls.js → frameworks/media/views/mini_controls.js b/frameworks/media/views/miniControls.js → frameworks/media/views/mini_controls.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)

diff --git a/frameworks/media/views/simpleControls.js → frameworks/media/views/simple_controls.js b/frameworks/media/views/simpleControls.js → frameworks/media/views/simple_controls.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 /*globals SC */
 
-sc_require('views/mediaSlider');
+sc_require('views/media_slider');
 /** @class
 
   (Document Your View Here)
@@ -43,7 +43,7 @@ SC.SimpleMediaControlsView = SC.View.extend({
     renderStyle: 'renderImage',
     theme: ''
   }),
-  progressView: SC.mediaSlider.design({
+  progressView: SC.MediaSlider.design({
     layout: { top: 0, left: 25, right: 0, height:20 },
     value:0,
     minimum: 0,

diff --git a/frameworks/media/views/video.js b/frameworks/media/views/video.js
@@ -7,7 +7,7 @@
 
 
 sc_require('views/controls');
-sc_require('views/miniControls');
+sc_require('views/mini_controls');
 
 /** 
   @class
@@ -203,7 +203,10 @@ SC.VideoView = SC.View.extend({
           return;
         case "flash":
           var flashURL= sc_static('videoCanvas.swf');
+
           var movieURL = this.get('value');
+          if (!movieURL) return;
+
           if(movieURL.indexOf('http:')==-1){
             movieURL=location.protocol+'//'+location.host+movieURL;
           }