| Index: branches/js2-work/phase3/js/mwEmbed/loader.js |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | //If we are in debug mode ( results in fresh debug javascript includes ) |
| 80 | 80 | 'debug' : false, |
| 81 | 81 | |
| 82 | | - // Valid language codes ( has a file in /includes/languages/classes/Language{code}.js ) |
| | 82 | + // Valid language codes ( has a file in /languages/classes/Language{code}.js ) |
| 83 | 83 | // TODO: mirror the mediaWiki language "fallback" system |
| 84 | 84 | 'languageCodeList': ['en', 'am', 'ar', 'bat_smg', 'be_tarak', 'be', 'bh', |
| 85 | 85 | 'bs', 'cs', 'cu', 'cy', 'dsb', 'fr', 'ga', 'gd', 'gv', 'he', 'hi', |
| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Timed_Text.html |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | </td> |
| 36 | 36 | </tr> |
| 37 | 37 | |
| 38 | | - <!-- |
| | 38 | + |
| 39 | 39 | <tr> |
| 40 | 40 | <td valign="top" width="410"> |
| 41 | 41 | |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | poster="http://www.annodex.net/~silvia/itext/elephants_dream/elephant.png" |
| 44 | 44 | duration="10:53" |
| 45 | 45 | linkback="http://www.annodex.net/~silvia/itext/elephant_no_skin_v2.html" > |
| 46 | | - <source type="video/ogg" src="http://www.archive.org/download/ElephantsDream/ed_hd.ogv" ></source> |
| | 46 | + <source type="video/ogg" src="http://upload.wikimedia.org/wikipedia/commons/8/83/Elephants_Dream_%28high_quality%29.ogv" ></source> |
| 47 | 47 | <source type="video/h264" src="http://www.archive.org/download/ElephantsDream/ed_1024_512kb.mp4"></source> |
| 48 | 48 | <itextlist category="SUB" name="Subtitles A-F"> |
| 49 | 49 | <itext id="video_af" lang="af" charset="ISO-8859-1" |
| — | — | @@ -124,9 +124,10 @@ |
| 125 | 125 | <itext id="chapters" lang="en" charset="ISO-8859-1" |
| 126 | 126 | src="media/elephants_dream/chapters.srt"></itext> |
| 127 | 127 | </itextlist> |
| 128 | | - |
| | 128 | + |
| 129 | 129 | </video> |
| 130 | 130 | </td> |
| | 131 | + |
| 131 | 132 | <td valign="top"> |
| 132 | 133 | <h4>iText inline embed example</h4> |
| 133 | 134 | see: <a href="http://www.annodex.net/~silvia/itext/elephant_no_skin_v2.html">Video Player Accessibility</a> |
| — | — | @@ -224,7 +225,7 @@ |
| 225 | 226 | </textarea> |
| 226 | 227 | </td> |
| 227 | 228 | </tr> |
| 228 | | - --> |
| | 229 | + |
| 229 | 230 | <!-- |
| 230 | 231 | |
| 231 | 232 | |
| Index: branches/js2-work/phase3/js/mwEmbed/includes/jsClassLoader.php |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | */ |
| 111 | 111 | public static function getLanguageJs( $langKey = 'en' ){ |
| 112 | 112 | global $wgMwEmbedDirectory; |
| 113 | | - $path = $wgMwEmbedDirectory . 'includes/languages/classes/Language' . ucfirst( $langKey ) . '.js'; |
| | 113 | + $path = $wgMwEmbedDirectory . 'languages/classes/Language' . ucfirst( $langKey ) . '.js'; |
| 114 | 114 | if( is_file( $path ) ){ |
| 115 | 115 | $languageJs = file_get_contents( $path ); |
| 116 | 116 | return $languageJs; |
| Index: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | } else { |
| 116 | 116 | // Add some space to interface for the control bar ( if not overlaying controls ) |
| 117 | 117 | embedPlayer.$interface.css( { |
| 118 | | - 'height' : parseInt( embedPlayer.height ) + parseInt( this.height ) +2 |
| | 118 | + 'height' : parseInt( embedPlayer.height ) + parseInt( this.height ) + 2 |
| 119 | 119 | } ); |
| 120 | 120 | // update the control bar display to "block" |
| 121 | 121 | $controlBar.css('display', 'block') |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/jquery.menu/jquery.menu.js |
| — | — | @@ -173,7 +173,9 @@ |
| 174 | 174 | this.showMenu = function() { |
| 175 | 175 | mw.log('$j.menu:: show menu' ); |
| 176 | 176 | killAllMenus(); |
| 177 | | - if (!menu.menuExists) { menu.create() }; |
| | 177 | + if (!menu.menuExists) { |
| | 178 | + menu.create() |
| | 179 | + }; |
| 178 | 180 | caller |
| 179 | 181 | .addClass('fg-menu-open') |
| 180 | 182 | .addClass(options.callerOnState); |
| — | — | @@ -313,8 +315,8 @@ |
| 314 | 316 | }, |
| 315 | 317 | function() { $(this).removeClass(options.linkHoverSecondary); } |
| 316 | 318 | ); |
| 317 | | - }; |
| 318 | | - |
| | 319 | + }; |
| | 320 | + |
| 319 | 321 | menu.setPosition(container, caller, options); |
| 320 | 322 | menu.menuExists = true; |
| 321 | 323 | }; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/mw.TimedText.js |
| — | — | @@ -784,23 +784,30 @@ |
| 785 | 785 | // Setup the display text div: |
| 786 | 786 | var layoutMode = this.getLayoutMode(); |
| 787 | 787 | if( layoutMode == 'ontop' ) { |
| 788 | | - $playerTarget.append( |
| 789 | | - $j('<div>').addClass( 'itext' + ' ' + 'itext_' + category ) |
| 790 | | - .css( { |
| 791 | | - 'position':'absolute', |
| 792 | | - 'bottom': ( this.embedPlayer.ctrlBuilder.getHeight() + 10 ), |
| 793 | | - 'width': '100%', |
| 794 | | - 'display': 'block', |
| 795 | | - 'opacity': .8, |
| 796 | | - 'text-align':'center' |
| 797 | | - }).append( |
| 798 | | - $j('<span>').css({ |
| 799 | | - 'color':'white', |
| 800 | | - 'background-color':'#333' |
| 801 | | - }) |
| 802 | | - ) |
| 803 | | - ); |
| | 788 | + var $itext = $j('<div>') |
| | 789 | + .addClass( 'itext' + ' ' + 'itext_' + category ) |
| | 790 | + .css( { |
| | 791 | + 'position':'absolute', |
| | 792 | + 'bottom': ( this.embedPlayer.ctrlBuilder.getHeight() + 10 ), |
| | 793 | + 'width': '100%', |
| | 794 | + 'display': 'block', |
| | 795 | + 'opacity': .8, |
| | 796 | + 'text-align':'center' |
| | 797 | + }) |
| | 798 | + .append( |
| | 799 | + $j('<span>').css({ |
| | 800 | + 'color':'white', |
| | 801 | + 'background-color':'#333' |
| | 802 | + }) |
| | 803 | + ) |
| 804 | 804 | |
| | 805 | + // If in fullscreen mode update the text size: |
| | 806 | + if( this.embedPlayer.ctrlBuilder.fullscreenMode ){ |
| | 807 | + $itext.css( |
| | 808 | + this.embedPlayer.ctrlBuilder.getFullscreenTextCss() |
| | 809 | + ); |
| | 810 | + } |
| | 811 | + $playerTarget.append( $itext ); |
| 805 | 812 | // Resize the interface for layoutMode == 'ontop' ( if not in fullscreen ) |
| 806 | 813 | // NOTE this shoudl be a call to ctrlBuilder not handled here inline |
| 807 | 814 | if( ! this.embedPlayer.ctrlBuilder.fullscreenMode ){ |
| — | — | @@ -833,8 +840,8 @@ |
| 834 | 841 | } ) |
| 835 | 842 | ) |
| 836 | 843 | ); |
| 837 | | - // |
| 838 | | - var height = belowBarHeight + this.embedPlayer.getHeight() + this.embedPlayer.ctrlBuilder.getHeight(); |
| | 844 | + // Add some height for the bar and interface |
| | 845 | + var height = ( belowBarHeight + 8 ) + this.embedPlayer.getHeight() + this.embedPlayer.ctrlBuilder.getHeight(); |
| 839 | 846 | // Resize the interface for layoutMode == 'below' ( if not in full screen) |
| 840 | 847 | if( ! this.embedPlayer.ctrlBuilder.fullscreenMode ){ |
| 841 | 848 | this.embedPlayer.$interface.animate({ |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/javaEmbed.js |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | |
| 55 | 55 | // Wrap it in an iframe to avoid hanging the event thread in FF 2/3 and similar |
| 56 | 56 | // Doesn't work in MSIE or Safari/Mac or Opera 9.5 |
| 57 | | - if ( $j.browser.mozilla ) { |
| | 57 | + /*if ( $j.browser.mozilla ) { |
| 58 | 58 | var iframe = document.createElement( 'iframe' ); |
| 59 | 59 | iframe.setAttribute( 'width', this.getWidth() ); |
| 60 | 60 | iframe.setAttribute( 'height', this.getHeight() ); |
| — | — | @@ -72,9 +72,9 @@ |
| 73 | 73 | newDoc.write( '<html><body>' + appletCode + '</body></html>' ); |
| 74 | 74 | // spurious error in some versions of FF, no workaround known |
| 75 | 75 | newDoc.close(); |
| 76 | | - } else { |
| | 76 | + } else {*/ |
| 77 | 77 | $j( this ).html( appletCode ); |
| 78 | | - } |
| | 78 | + //} |
| 79 | 79 | |
| 80 | 80 | // Start the monitor: |
| 81 | 81 | this.monitor(); |
| — | — | @@ -174,11 +174,11 @@ |
| 175 | 175 | * Update the playerElement instance with a pointer to the embed object |
| 176 | 176 | */ |
| 177 | 177 | getPlayerElement:function() { |
| 178 | | - if ( $j.browser.mozilla ) { |
| 179 | | - this.playerElement = $j('#cframe_' + this.id).contents().find( '#' + this.pid ); |
| 180 | | - } else { |
| | 178 | + //if ( $j.browser.mozilla ) { |
| | 179 | + // this.playerElement = $j('#cframe_' + this.id).contents().find( '#' + this.pid ); |
| | 180 | + //} else { |
| 181 | 181 | this.playerElement = $j( '#' + this.pid ).get( 0 ); |
| 182 | | - } |
| | 182 | + //} |
| 183 | 183 | }, |
| 184 | 184 | |
| 185 | 185 | /** |
| Index: branches/js2-work/phase3/js/apiProxyPage.js |
| — | — | @@ -19,16 +19,15 @@ |
| 20 | 20 | var mwApiProxyDefaultConfig = { |
| 21 | 21 | 'master_whitelist' : [ 'en.wikipedia.org', 'localhost', '127.1.1.100' ], |
| 22 | 22 | 'master_blacklist' : [] |
| 23 | | -}; |
| | 23 | +}; |
| 24 | 24 | |
| 25 | | - |
| 26 | 25 | // User white_list should also be checked and configured at runtime. |
| 27 | 26 | mw.ready( function() { |
| 28 | 27 | // Build our configuration from the default and mwApiProxyConfig vars |
| 29 | 28 | mwApiProxyConfig = $j.extend( true, mwApiProxyDefaultConfig, mwApiProxyConfig ); |
| 30 | 29 | mw.setConfig( 'apiProxyConfig', mwApiProxyConfig); |
| 31 | 30 | |
| 32 | | - //Do a setTimeout to 0 to call after other zero delay async events |
| | 31 | + // Do a setTimeout to 0 to call after other zero delay async events |
| 33 | 32 | // ( once everyone is doing buildout withthin mwsetup priror to .ready this won't be needed. ) |
| 34 | 33 | mw.load( 'ApiProxy', function(){ |
| 35 | 34 | //Clear out the page content ( not needed for iframe proxy ) |