Merge branch 'master' of https://github.com/kaltura/mwEmbed

kaltura · Dec 6, 2012 · b00ff38 · b00ff38
2 parents 33e2c5a + 8bcd47f
commit b00ff38
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/modules/KalturaSupport/tests/CaptionsKalturaApi.html b/modules/KalturaSupport/tests/CaptionsKalturaApi.html
@@ -60,7 +60,6 @@ <h2> Captions over player, api </h2>
 <script>
 	var flashvars = {
 		'closedCaptionsOverPlayer': {
-			'plugin' : true,
 			'defaultLanguageKey': 'en',
 			'fontsize': 12,
 			'bg' : '0x335544',

diff --git a/modules/KalturaSupport/tests/CaptionsUnderPlayer.qunit.html b/modules/KalturaSupport/tests/CaptionsUnderPlayer.qunit.html
@@ -59,7 +59,6 @@ <h2> Captions Under Player for kdp flash player and html5 player </h2>
 <script>
 	var flashvars = {
 		'closedCaptionsUnderPlayer': {
-			'plugin' : true,
 			'defaultLanguageKey': 'en',
 			'fontsize': 12,
 			'bg' : '3355443',

diff --git a/modules/KalturaSupport/tests/FlavorSelector.preferedFlavorBR.qunit.html b/modules/KalturaSupport/tests/FlavorSelector.preferedFlavorBR.qunit.html
@@ -63,9 +63,12 @@ <h2> Flavor Selector test </h2>
 </div>
 <script>
 	var flashvars = {
-		'flavorComboControllerScreen': {
-			'plugin' : true
-		},
+					'flavorComboControllerScreen': {
+					'plugin' : true,
+					'path' : "/content/uiconf/ps/kaltura/kdp/v3.6.9/plugins/facadePlugin.swf",
+					'relativeTo': 'video',
+					'position': 'before' 
+					},
 		'mediaProxy.preferedFlavorBR': 400
 	};
 	function doEmbedPlayer( fv ){

diff --git a/modules/NielsenCombined/tests/NielsenCombinedPlayer.qunit.html b/modules/NielsenCombined/tests/NielsenCombinedPlayer.qunit.html
@@ -142,6 +142,8 @@ <h2> Nielsen Combined</h2>
 	var flashvars = {
 			'nielsenCombined':{
 				'plugin': true,
+				'position': "before",
+				'relativeTo': "video",				
 				'trackEventMonitor' : 'trackEvent',
 				'clientId':"us-502202", 
 				'vcid':"c15",
@@ -159,7 +161,7 @@ <h2> Nielsen Combined</h2>
 		kWidget.embed({
 			'targetId' : 'kaltura_player',
 			'wid' : '_243342',
-			'uiconf_id' : '6037081',
+			'uiconf_id' : '11138511',
 			'entry_id' : '0_swup5zao',
 			'flashvars': fv
 		})