Merge pull request #489 from virtual-world-framework/branch/jplayer-p…

…reload Branch/jplayer preload
virtual-world-framework · Apr 21, 2015 · 61daccf · 61daccf
2 parents be8d366 + 4463792
commit 61daccf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/support/client/lib/vwf/model/jPlayer.js b/support/client/lib/vwf/model/jPlayer.js
@@ -220,6 +220,7 @@ define( [
                         setUrl( node, propertyValue );
                         value = node.url;
                         break;
+
                     case "loop":
                         setLoop( node, propertyValue );
                         value = node.loop;
@@ -361,12 +362,21 @@ define( [
 
                 switch( methodName ) {
 
-                    case "play":
+                    case "load":
+                        if( node.url ) {
+                            node.jPlayerElement.jPlayer( "load" ); 
+                            this.logger.infox( "Loading!" ); 
+                        } else {
+                            this.logger.errorx( "No URL given!" ); 
+                        }
+                        break;
 
-                        if( methodParameters ){
-                            this.kernel.setProperty( node.ID, "url", methodParameters );
+                    case "play":
+                        if( node.url ) {
+                            node.jPlayerElement.jPlayer( "play" ); 
+                        } else {
+                            this.logger.errorx( "No URL given!" ); 
                         }
-                        node.jPlayerElement.jPlayer( "play" ); 
                         break;
 
                     case "pause":

diff --git a/support/proxy/vwf.example.com/jplayer/videoManager.vwf.yaml b/support/proxy/vwf.example.com/jplayer/videoManager.vwf.yaml
@@ -10,11 +10,12 @@ properties:
   containerSize: [ 1024, 768 ]
   playerSize: [ 1024, 768 ]
 methods:
+  load:
   play: 
   pause:
   stop: 
   show:
   hide: 
   clearMedia: 
 events:
-  videoEnded: 
+  videoEnded: 
diff --git a/support/proxy/vwf.example.com/sceneGetter.js b/support/proxy/vwf.example.com/sceneGetter.js