| Index: branches/new-upload/phase3/js2/mwEmbed/php/noMediaWikiConfig.php |
| — | — | @@ -10,8 +10,8 @@ |
| 11 | 11 | |
| 12 | 12 | $IP = realpath(dirname(__FILE__).'/../'); |
| 13 | 13 | |
| 14 | | -//$mwEmbedDirectory becomes the root $IP |
| 15 | | -$mwEmbedDirectory = ''; |
| | 14 | +//$wgMwEmbedDirectory becomes the root $IP |
| | 15 | +$wgMwEmbedDirectory = ''; |
| 16 | 16 | |
| 17 | 17 | $wgUseFileCache = true; |
| 18 | 18 | |
| Index: branches/new-upload/phase3/js2/mwEmbed/php/jsAutoloadLocalClasses.php |
| — | — | @@ -1,83 +1,83 @@ |
| 2 | 2 | <?php |
| 3 | 3 | if ( !defined( 'MEDIAWIKI' ) ) die(1); |
| 4 | 4 | |
| 5 | | -global $wgJSAutoloadLocalClasses, $mwEmbedDirectory; |
| | 5 | +global $wgJSAutoloadLocalClasses, $wgMwEmbedDirectory; |
| 6 | 6 | |
| 7 | 7 | //the basis of the loader calls: |
| 8 | | - $wgJSAutoloadLocalClasses['mv_embed'] = $mwEmbedDirectory . 'mv_embed.js'; |
| | 8 | + $wgJSAutoloadLocalClasses['mv_embed'] = $wgMwEmbedDirectory . 'mv_embed.js'; |
| 9 | 9 | |
| 10 | 10 | //core: |
| 11 | | - $wgJSAutoloadLocalClasses['window.jQuery'] = $mwEmbedDirectory . 'jquery/jquery-1.3.2.js'; |
| | 11 | + $wgJSAutoloadLocalClasses['window.jQuery'] = $wgMwEmbedDirectory . 'jquery/jquery-1.3.2.js'; |
| 12 | 12 | |
| 13 | | - $wgJSAutoloadLocalClasses['j.secureEvalJSON'] = $mwEmbedDirectory . 'jquery/plugins/jquery.json-1.3.js'; |
| | 13 | + $wgJSAutoloadLocalClasses['j.secureEvalJSON'] = $wgMwEmbedDirectory . 'jquery/plugins/jquery.json-1.3.js'; |
| 14 | 14 | |
| 15 | | - $wgJSAutoloadLocalClasses['j.cookie'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/external/jquery.cookie.js'; |
| | 15 | + $wgJSAutoloadLocalClasses['j.cookie'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/external/cookie/jquery.cookie.js'; |
| 16 | 16 | |
| 17 | | - $wgJSAutoloadLocalClasses['j.contextMenu'] = $mwEmbedDirectory . 'jquery/plugins/jquery.contextMenu.js'; |
| 18 | | - $wgJSAutoloadLocalClasses['j.fn.autocomplete'] = $mwEmbedDirectory . 'jquery/plugins/jquery.autocomplete.js'; |
| 19 | | - $wgJSAutoloadLocalClasses['j.fn.hoverIntent'] = $mwEmbedDirectory . 'jquery/plugins/jquery.hoverIntent.js'; |
| 20 | | - $wgJSAutoloadLocalClasses['j.Jcrop'] = $mwEmbedDirectory . 'jquery/plugins/Jcrop/js/jquery.Jcrop.js'; |
| 21 | | - $wgJSAutoloadLocalClasses['Date.fromString'] = $mwEmbedDirectory . 'jquery/plugins/date.js'; |
| 22 | | - $wgJSAutoloadLocalClasses['j.fn.datePicker'] = $mwEmbedDirectory . 'jquery/plugins/jquery.datePicker.js'; |
| | 17 | + $wgJSAutoloadLocalClasses['j.contextMenu'] = $wgMwEmbedDirectory . 'jquery/plugins/jquery.contextMenu.js'; |
| | 18 | + $wgJSAutoloadLocalClasses['j.fn.autocomplete'] = $wgMwEmbedDirectory . 'jquery/plugins/jquery.autocomplete.js'; |
| | 19 | + $wgJSAutoloadLocalClasses['j.fn.hoverIntent'] = $wgMwEmbedDirectory . 'jquery/plugins/jquery.hoverIntent.js'; |
| | 20 | + $wgJSAutoloadLocalClasses['j.Jcrop'] = $wgMwEmbedDirectory . 'jquery/plugins/Jcrop/js/jquery.Jcrop.js'; |
| | 21 | + $wgJSAutoloadLocalClasses['Date.fromString'] = $wgMwEmbedDirectory . 'jquery/plugins/date.js'; |
| | 22 | + $wgJSAutoloadLocalClasses['j.fn.datePicker'] = $wgMwEmbedDirectory . 'jquery/plugins/jquery.datePicker.js'; |
| 23 | 23 | |
| 24 | 24 | //jquery.ui |
| 25 | | - $wgJSAutoloadLocalClasses['j.ui'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.core.js'; |
| | 25 | + $wgJSAutoloadLocalClasses['j.ui'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.core.js'; |
| 26 | 26 | |
| 27 | | - $wgJSAutoloadLocalClasses['j.effects.blind'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.blind.js'; |
| 28 | | - $wgJSAutoloadLocalClasses['j.effects.drop'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.drop.js'; |
| 29 | | - $wgJSAutoloadLocalClasses['j.effects.pulsate'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.pulsate.js'; |
| 30 | | - $wgJSAutoloadLocalClasses['j.effects.transfer'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.transfer.js'; |
| 31 | | - $wgJSAutoloadLocalClasses['j.ui.droppable'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.droppable.js'; |
| 32 | | - $wgJSAutoloadLocalClasses['j.ui.slider'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.slider.js'; |
| 33 | | - $wgJSAutoloadLocalClasses['j.effects.bounce'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.bounce.js'; |
| 34 | | - $wgJSAutoloadLocalClasses['j.effects.explode'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.explode.js'; |
| 35 | | - $wgJSAutoloadLocalClasses['j.effects.scale'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.scale.js'; |
| 36 | | - $wgJSAutoloadLocalClasses['j.ui.datepicker'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.datepicker.js'; |
| 37 | | - $wgJSAutoloadLocalClasses['j.ui.progressbar'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.progressbar.js'; |
| 38 | | - $wgJSAutoloadLocalClasses['j.ui.sortable'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.sortable.js'; |
| 39 | | - $wgJSAutoloadLocalClasses['j.effects.clip'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.clip.js'; |
| 40 | | - $wgJSAutoloadLocalClasses['j.effects.fold'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.fold.js'; |
| 41 | | - $wgJSAutoloadLocalClasses['j.effects.shake'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.shake.js'; |
| 42 | | - $wgJSAutoloadLocalClasses['j.ui.dialog'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.dialog.js'; |
| 43 | | - $wgJSAutoloadLocalClasses['j.ui.resizable'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.resizable.js'; |
| 44 | | - $wgJSAutoloadLocalClasses['j.ui.tabs'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.tabs.js'; |
| 45 | | - $wgJSAutoloadLocalClasses['j.effects.core'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.core.js'; |
| 46 | | - $wgJSAutoloadLocalClasses['j.effects.highlight']= $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.highlight.js'; |
| 47 | | - $wgJSAutoloadLocalClasses['j.effects.slide'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.slide.js'; |
| 48 | | - $wgJSAutoloadLocalClasses['j.ui.accordion'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.accordion.js'; |
| 49 | | - $wgJSAutoloadLocalClasses['j.ui.draggable'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.draggable.js'; |
| 50 | | - $wgJSAutoloadLocalClasses['j.ui.selectable'] = $mwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.selectable.js'; |
| | 27 | + $wgJSAutoloadLocalClasses['j.effects.blind'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.blind.js'; |
| | 28 | + $wgJSAutoloadLocalClasses['j.effects.drop'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.drop.js'; |
| | 29 | + $wgJSAutoloadLocalClasses['j.effects.pulsate'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.pulsate.js'; |
| | 30 | + $wgJSAutoloadLocalClasses['j.effects.transfer'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.transfer.js'; |
| | 31 | + $wgJSAutoloadLocalClasses['j.ui.droppable'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.droppable.js'; |
| | 32 | + $wgJSAutoloadLocalClasses['j.ui.slider'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.slider.js'; |
| | 33 | + $wgJSAutoloadLocalClasses['j.effects.bounce'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.bounce.js'; |
| | 34 | + $wgJSAutoloadLocalClasses['j.effects.explode'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.explode.js'; |
| | 35 | + $wgJSAutoloadLocalClasses['j.effects.scale'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.scale.js'; |
| | 36 | + $wgJSAutoloadLocalClasses['j.ui.datepicker'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.datepicker.js'; |
| | 37 | + $wgJSAutoloadLocalClasses['j.ui.progressbar'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.progressbar.js'; |
| | 38 | + $wgJSAutoloadLocalClasses['j.ui.sortable'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.sortable.js'; |
| | 39 | + $wgJSAutoloadLocalClasses['j.effects.clip'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.clip.js'; |
| | 40 | + $wgJSAutoloadLocalClasses['j.effects.fold'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.fold.js'; |
| | 41 | + $wgJSAutoloadLocalClasses['j.effects.shake'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.shake.js'; |
| | 42 | + $wgJSAutoloadLocalClasses['j.ui.dialog'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.dialog.js'; |
| | 43 | + $wgJSAutoloadLocalClasses['j.ui.resizable'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.resizable.js'; |
| | 44 | + $wgJSAutoloadLocalClasses['j.ui.tabs'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.tabs.js'; |
| | 45 | + $wgJSAutoloadLocalClasses['j.effects.core'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.core.js'; |
| | 46 | + $wgJSAutoloadLocalClasses['j.effects.highlight']= $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.highlight.js'; |
| | 47 | + $wgJSAutoloadLocalClasses['j.effects.slide'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/effects.slide.js'; |
| | 48 | + $wgJSAutoloadLocalClasses['j.ui.accordion'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.accordion.js'; |
| | 49 | + $wgJSAutoloadLocalClasses['j.ui.draggable'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.draggable.js'; |
| | 50 | + $wgJSAutoloadLocalClasses['j.ui.selectable'] = $wgMwEmbedDirectory . 'jquery/jquery.ui-1.7.1/ui/ui.selectable.js'; |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | //libAddMedia: |
| 54 | | - $wgJSAutoloadLocalClasses['mvFirefogg'] = $mwEmbedDirectory . 'libAddMedia/mvFirefogg.js'; |
| 55 | | - $wgJSAutoloadLocalClasses['mvAdvFirefogg'] = $mwEmbedDirectory . 'libAddMedia/advFirefogg.js'; |
| 56 | | - $wgJSAutoloadLocalClasses['mvUploader'] = $mwEmbedDirectory . 'libAddMedia/mvUploader.js'; |
| 57 | | - $wgJSAutoloadLocalClasses['remoteSearchDriver'] = $mwEmbedDirectory . 'libAddMedia/remoteSearchDriver.js'; |
| 58 | | - $wgJSAutoloadLocalClasses['seqRemoteSearchDriver'] = $mwEmbedDirectory . 'libAddMedia/seqRemoteSearchDriver.js'; |
| 59 | | - $wgJSAutoloadLocalClasses['baseRemoteSearch'] = $mwEmbedDirectory . 'libAddMedia/searchLibs/baseRemoteSearch.js'; |
| 60 | | - $wgJSAutoloadLocalClasses['mediaWikiSearch'] = $mwEmbedDirectory . 'libAddMedia/searchLibs/mediaWikiSearch.js'; |
| 61 | | - $wgJSAutoloadLocalClasses['metavidSearch'] = $mwEmbedDirectory . 'libAddMedia/searchLibs/metavidSearch.js'; |
| 62 | | - $wgJSAutoloadLocalClasses['archiveOrgSearch'] = $mwEmbedDirectory . 'libAddMedia/searchLibs/archiveOrgSearch.js'; |
| 63 | | - $wgJSAutoloadLocalClasses['baseRemoteSearch'] = $mwEmbedDirectory . 'libAddMedia/searchLibs/baseRemoteSearch.js'; |
| | 54 | + $wgJSAutoloadLocalClasses['mvFirefogg'] = $wgMwEmbedDirectory . 'libAddMedia/mvFirefogg.js'; |
| | 55 | + $wgJSAutoloadLocalClasses['mvAdvFirefogg'] = $wgMwEmbedDirectory . 'libAddMedia/advFirefogg.js'; |
| | 56 | + $wgJSAutoloadLocalClasses['mvUploader'] = $wgMwEmbedDirectory . 'libAddMedia/mvUploader.js'; |
| | 57 | + $wgJSAutoloadLocalClasses['remoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/remoteSearchDriver.js'; |
| | 58 | + $wgJSAutoloadLocalClasses['seqRemoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/seqRemoteSearchDriver.js'; |
| | 59 | + $wgJSAutoloadLocalClasses['baseRemoteSearch'] = $wgMwEmbedDirectory . 'libAddMedia/searchLibs/baseRemoteSearch.js'; |
| | 60 | + $wgJSAutoloadLocalClasses['mediaWikiSearch'] = $wgMwEmbedDirectory . 'libAddMedia/searchLibs/mediaWikiSearch.js'; |
| | 61 | + $wgJSAutoloadLocalClasses['metavidSearch'] = $wgMwEmbedDirectory . 'libAddMedia/searchLibs/metavidSearch.js'; |
| | 62 | + $wgJSAutoloadLocalClasses['archiveOrgSearch'] = $wgMwEmbedDirectory . 'libAddMedia/searchLibs/archiveOrgSearch.js'; |
| | 63 | + $wgJSAutoloadLocalClasses['baseRemoteSearch'] = $wgMwEmbedDirectory . 'libAddMedia/searchLibs/baseRemoteSearch.js'; |
| 64 | 64 | |
| 65 | 65 | //libClipEdit: |
| 66 | | - $wgJSAutoloadLocalClasses['mvClipEdit'] = $mwEmbedDirectory . 'libClipEdit/mvClipEdit.js'; |
| | 66 | + $wgJSAutoloadLocalClasses['mvClipEdit'] = $wgMwEmbedDirectory . 'libClipEdit/mvClipEdit.js'; |
| 67 | 67 | |
| 68 | 68 | //libEmbedObj: |
| 69 | | - $wgJSAutoloadLocalClasses['embedVideo'] = $mwEmbedDirectory . 'libEmbedObj/mv_baseEmbed.js'; |
| 70 | | - $wgJSAutoloadLocalClasses['flashEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_flashEmbed.js'; |
| 71 | | - $wgJSAutoloadLocalClasses['genericEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_genericEmbed.js'; |
| 72 | | - $wgJSAutoloadLocalClasses['htmlEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_htmlEmbed.js'; |
| 73 | | - $wgJSAutoloadLocalClasses['javaEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_javaEmbed.js'; |
| 74 | | - $wgJSAutoloadLocalClasses['nativeEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_nativeEmbed.js'; |
| 75 | | - $wgJSAutoloadLocalClasses['quicktimeEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_quicktimeEmbed.js'; |
| 76 | | - $wgJSAutoloadLocalClasses['vlcEmbed'] = $mwEmbedDirectory . 'libEmbedObj/mv_vlcEmbed.js'; |
| | 69 | + $wgJSAutoloadLocalClasses['embedVideo'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_baseEmbed.js'; |
| | 70 | + $wgJSAutoloadLocalClasses['flashEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_flashEmbed.js'; |
| | 71 | + $wgJSAutoloadLocalClasses['genericEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_genericEmbed.js'; |
| | 72 | + $wgJSAutoloadLocalClasses['htmlEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_htmlEmbed.js'; |
| | 73 | + $wgJSAutoloadLocalClasses['javaEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_javaEmbed.js'; |
| | 74 | + $wgJSAutoloadLocalClasses['nativeEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_nativeEmbed.js'; |
| | 75 | + $wgJSAutoloadLocalClasses['quicktimeEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_quicktimeEmbed.js'; |
| | 76 | + $wgJSAutoloadLocalClasses['vlcEmbed'] = $wgMwEmbedDirectory . 'libEmbedObj/mv_vlcEmbed.js'; |
| 77 | 77 | |
| 78 | 78 | //libSequencer: |
| 79 | | - $wgJSAutoloadLocalClasses['mvPlayList'] = $mwEmbedDirectory . 'libSequencer/mvPlayList.js'; |
| 80 | | - $wgJSAutoloadLocalClasses['mvSequencer'] = $mwEmbedDirectory . 'libSequencer/mvSequencer.js'; |
| | 79 | + $wgJSAutoloadLocalClasses['mvPlayList'] = $wgMwEmbedDirectory . 'libSequencer/mvPlayList.js'; |
| | 80 | + $wgJSAutoloadLocalClasses['mvSequencer'] = $wgMwEmbedDirectory . 'libSequencer/mvSequencer.js'; |
| 81 | 81 | |
| 82 | 82 | //libTimedText: |
| 83 | | - $wgJSAutoloadLocalClasses['mvTextInterface'] = $mwEmbedDirectory . 'libTimedText/mvTextInterface.js'; |
| | 83 | + $wgJSAutoloadLocalClasses['mvTextInterface'] = $wgMwEmbedDirectory . 'libTimedText/mvTextInterface.js'; |
| 84 | 84 | ?> |
| \ No newline at end of file |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 85 | 85 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_cd0a0a_256x240.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_cd0a0a_256x240.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 86 | 86 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 87 | 87 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_454545_256x240.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_454545_256x240.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 88 | 88 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_222222_256x240.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_222222_256x240.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 89 | 89 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_2e83ff_256x240.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_2e83ff_256x240.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 90 | 90 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_95_fef1ec_1x400.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_95_fef1ec_1x400.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 91 | 91 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_888888_256x240.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-icons_888888_256x240.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 92 | 92 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 93 | 93 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_75_dadada_1x400.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_75_dadada_1x400.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 94 | 94 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_flat_75_ffffff_40x100.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_flat_75_ffffff_40x100.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 95 | 95 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 96 | 96 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_65_ffffff_1x400.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/images/ui-bg_glass_65_ffffff_1x400.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 97 | 97 | + application/octet-stream |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/jquery.ui.smoothness/jquery-ui-1.7.1.custom.css |
| — | — | @@ -0,0 +1,404 @@ |
| | 2 | +/* |
| | 3 | +* jQuery UI CSS Framework |
| | 4 | +* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) |
| | 5 | +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. |
| | 6 | +*/ |
| | 7 | + |
| | 8 | +/* Layout helpers |
| | 9 | +----------------------------------*/ |
| | 10 | +.ui-helper-hidden { display: none; } |
| | 11 | +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } |
| | 12 | +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } |
| | 13 | +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } |
| | 14 | +.ui-helper-clearfix { display: inline-block; } |
| | 15 | +/* required comment for clearfix to work in Opera \*/ |
| | 16 | +* html .ui-helper-clearfix { height:1%; } |
| | 17 | +.ui-helper-clearfix { display:block; } |
| | 18 | +/* end clearfix */ |
| | 19 | +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } |
| | 20 | + |
| | 21 | + |
| | 22 | +/* Interaction Cues |
| | 23 | +----------------------------------*/ |
| | 24 | +.ui-state-disabled { cursor: default !important; } |
| | 25 | + |
| | 26 | + |
| | 27 | +/* Icons |
| | 28 | +----------------------------------*/ |
| | 29 | + |
| | 30 | +/* states and images */ |
| | 31 | +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } |
| | 32 | + |
| | 33 | + |
| | 34 | +/* Misc visuals |
| | 35 | +----------------------------------*/ |
| | 36 | + |
| | 37 | +/* Overlays */ |
| | 38 | +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } |
| | 39 | + |
| | 40 | +/* |
| | 41 | +* jQuery UI CSS Framework |
| | 42 | +* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) |
| | 43 | +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. |
| | 44 | +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px |
| | 45 | +*/ |
| | 46 | + |
| | 47 | + |
| | 48 | +/* Component containers |
| | 49 | +----------------------------------*/ |
| | 50 | +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } |
| | 51 | +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } |
| | 52 | +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } |
| | 53 | +.ui-widget-content a { color: #222222; } |
| | 54 | +.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } |
| | 55 | +.ui-widget-header a { color: #222222; } |
| | 56 | + |
| | 57 | +/* Interaction states |
| | 58 | +----------------------------------*/ |
| | 59 | +.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; } |
| | 60 | +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; } |
| | 61 | +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } |
| | 62 | +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; } |
| | 63 | +.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; } |
| | 64 | +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; } |
| | 65 | + |
| | 66 | +/* Interaction Cues |
| | 67 | +----------------------------------*/ |
| | 68 | +.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } |
| | 69 | +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; } |
| | 70 | +.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } |
| | 71 | +.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; } |
| | 72 | +.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; } |
| | 73 | +.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } |
| | 74 | +.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; } |
| | 75 | +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } |
| | 76 | + |
| | 77 | +/* Icons |
| | 78 | +----------------------------------*/ |
| | 79 | + |
| | 80 | +/* states and images */ |
| | 81 | +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } |
| | 82 | +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } |
| | 83 | +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } |
| | 84 | +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } |
| | 85 | +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } |
| | 86 | +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } |
| | 87 | +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } |
| | 88 | +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } |
| | 89 | + |
| | 90 | +/* positioning */ |
| | 91 | +.ui-icon-carat-1-n { background-position: 0 0; } |
| | 92 | +.ui-icon-carat-1-ne { background-position: -16px 0; } |
| | 93 | +.ui-icon-carat-1-e { background-position: -32px 0; } |
| | 94 | +.ui-icon-carat-1-se { background-position: -48px 0; } |
| | 95 | +.ui-icon-carat-1-s { background-position: -64px 0; } |
| | 96 | +.ui-icon-carat-1-sw { background-position: -80px 0; } |
| | 97 | +.ui-icon-carat-1-w { background-position: -96px 0; } |
| | 98 | +.ui-icon-carat-1-nw { background-position: -112px 0; } |
| | 99 | +.ui-icon-carat-2-n-s { background-position: -128px 0; } |
| | 100 | +.ui-icon-carat-2-e-w { background-position: -144px 0; } |
| | 101 | +.ui-icon-triangle-1-n { background-position: 0 -16px; } |
| | 102 | +.ui-icon-triangle-1-ne { background-position: -16px -16px; } |
| | 103 | +.ui-icon-triangle-1-e { background-position: -32px -16px; } |
| | 104 | +.ui-icon-triangle-1-se { background-position: -48px -16px; } |
| | 105 | +.ui-icon-triangle-1-s { background-position: -64px -16px; } |
| | 106 | +.ui-icon-triangle-1-sw { background-position: -80px -16px; } |
| | 107 | +.ui-icon-triangle-1-w { background-position: -96px -16px; } |
| | 108 | +.ui-icon-triangle-1-nw { background-position: -112px -16px; } |
| | 109 | +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } |
| | 110 | +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } |
| | 111 | +.ui-icon-arrow-1-n { background-position: 0 -32px; } |
| | 112 | +.ui-icon-arrow-1-ne { background-position: -16px -32px; } |
| | 113 | +.ui-icon-arrow-1-e { background-position: -32px -32px; } |
| | 114 | +.ui-icon-arrow-1-se { background-position: -48px -32px; } |
| | 115 | +.ui-icon-arrow-1-s { background-position: -64px -32px; } |
| | 116 | +.ui-icon-arrow-1-sw { background-position: -80px -32px; } |
| | 117 | +.ui-icon-arrow-1-w { background-position: -96px -32px; } |
| | 118 | +.ui-icon-arrow-1-nw { background-position: -112px -32px; } |
| | 119 | +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } |
| | 120 | +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } |
| | 121 | +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } |
| | 122 | +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } |
| | 123 | +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } |
| | 124 | +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } |
| | 125 | +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } |
| | 126 | +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } |
| | 127 | +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } |
| | 128 | +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } |
| | 129 | +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } |
| | 130 | +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } |
| | 131 | +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } |
| | 132 | +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } |
| | 133 | +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } |
| | 134 | +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } |
| | 135 | +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } |
| | 136 | +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } |
| | 137 | +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } |
| | 138 | +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } |
| | 139 | +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } |
| | 140 | +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } |
| | 141 | +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } |
| | 142 | +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } |
| | 143 | +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } |
| | 144 | +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } |
| | 145 | +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } |
| | 146 | +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } |
| | 147 | +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } |
| | 148 | +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } |
| | 149 | +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } |
| | 150 | +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } |
| | 151 | +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } |
| | 152 | +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } |
| | 153 | +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } |
| | 154 | +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } |
| | 155 | +.ui-icon-arrow-4 { background-position: 0 -80px; } |
| | 156 | +.ui-icon-arrow-4-diag { background-position: -16px -80px; } |
| | 157 | +.ui-icon-extlink { background-position: -32px -80px; } |
| | 158 | +.ui-icon-newwin { background-position: -48px -80px; } |
| | 159 | +.ui-icon-refresh { background-position: -64px -80px; } |
| | 160 | +.ui-icon-shuffle { background-position: -80px -80px; } |
| | 161 | +.ui-icon-transfer-e-w { background-position: -96px -80px; } |
| | 162 | +.ui-icon-transferthick-e-w { background-position: -112px -80px; } |
| | 163 | +.ui-icon-folder-collapsed { background-position: 0 -96px; } |
| | 164 | +.ui-icon-folder-open { background-position: -16px -96px; } |
| | 165 | +.ui-icon-document { background-position: -32px -96px; } |
| | 166 | +.ui-icon-document-b { background-position: -48px -96px; } |
| | 167 | +.ui-icon-note { background-position: -64px -96px; } |
| | 168 | +.ui-icon-mail-closed { background-position: -80px -96px; } |
| | 169 | +.ui-icon-mail-open { background-position: -96px -96px; } |
| | 170 | +.ui-icon-suitcase { background-position: -112px -96px; } |
| | 171 | +.ui-icon-comment { background-position: -128px -96px; } |
| | 172 | +.ui-icon-person { background-position: -144px -96px; } |
| | 173 | +.ui-icon-print { background-position: -160px -96px; } |
| | 174 | +.ui-icon-trash { background-position: -176px -96px; } |
| | 175 | +.ui-icon-locked { background-position: -192px -96px; } |
| | 176 | +.ui-icon-unlocked { background-position: -208px -96px; } |
| | 177 | +.ui-icon-bookmark { background-position: -224px -96px; } |
| | 178 | +.ui-icon-tag { background-position: -240px -96px; } |
| | 179 | +.ui-icon-home { background-position: 0 -112px; } |
| | 180 | +.ui-icon-flag { background-position: -16px -112px; } |
| | 181 | +.ui-icon-calendar { background-position: -32px -112px; } |
| | 182 | +.ui-icon-cart { background-position: -48px -112px; } |
| | 183 | +.ui-icon-pencil { background-position: -64px -112px; } |
| | 184 | +.ui-icon-clock { background-position: -80px -112px; } |
| | 185 | +.ui-icon-disk { background-position: -96px -112px; } |
| | 186 | +.ui-icon-calculator { background-position: -112px -112px; } |
| | 187 | +.ui-icon-zoomin { background-position: -128px -112px; } |
| | 188 | +.ui-icon-zoomout { background-position: -144px -112px; } |
| | 189 | +.ui-icon-search { background-position: -160px -112px; } |
| | 190 | +.ui-icon-wrench { background-position: -176px -112px; } |
| | 191 | +.ui-icon-gear { background-position: -192px -112px; } |
| | 192 | +.ui-icon-heart { background-position: -208px -112px; } |
| | 193 | +.ui-icon-star { background-position: -224px -112px; } |
| | 194 | +.ui-icon-link { background-position: -240px -112px; } |
| | 195 | +.ui-icon-cancel { background-position: 0 -128px; } |
| | 196 | +.ui-icon-plus { background-position: -16px -128px; } |
| | 197 | +.ui-icon-plusthick { background-position: -32px -128px; } |
| | 198 | +.ui-icon-minus { background-position: -48px -128px; } |
| | 199 | +.ui-icon-minusthick { background-position: -64px -128px; } |
| | 200 | +.ui-icon-close { background-position: -80px -128px; } |
| | 201 | +.ui-icon-closethick { background-position: -96px -128px; } |
| | 202 | +.ui-icon-key { background-position: -112px -128px; } |
| | 203 | +.ui-icon-lightbulb { background-position: -128px -128px; } |
| | 204 | +.ui-icon-scissors { background-position: -144px -128px; } |
| | 205 | +.ui-icon-clipboard { background-position: -160px -128px; } |
| | 206 | +.ui-icon-copy { background-position: -176px -128px; } |
| | 207 | +.ui-icon-contact { background-position: -192px -128px; } |
| | 208 | +.ui-icon-image { background-position: -208px -128px; } |
| | 209 | +.ui-icon-video { background-position: -224px -128px; } |
| | 210 | +.ui-icon-script { background-position: -240px -128px; } |
| | 211 | +.ui-icon-alert { background-position: 0 -144px; } |
| | 212 | +.ui-icon-info { background-position: -16px -144px; } |
| | 213 | +.ui-icon-notice { background-position: -32px -144px; } |
| | 214 | +.ui-icon-help { background-position: -48px -144px; } |
| | 215 | +.ui-icon-check { background-position: -64px -144px; } |
| | 216 | +.ui-icon-bullet { background-position: -80px -144px; } |
| | 217 | +.ui-icon-radio-off { background-position: -96px -144px; } |
| | 218 | +.ui-icon-radio-on { background-position: -112px -144px; } |
| | 219 | +.ui-icon-pin-w { background-position: -128px -144px; } |
| | 220 | +.ui-icon-pin-s { background-position: -144px -144px; } |
| | 221 | +.ui-icon-play { background-position: 0 -160px; } |
| | 222 | +.ui-icon-pause { background-position: -16px -160px; } |
| | 223 | +.ui-icon-seek-next { background-position: -32px -160px; } |
| | 224 | +.ui-icon-seek-prev { background-position: -48px -160px; } |
| | 225 | +.ui-icon-seek-end { background-position: -64px -160px; } |
| | 226 | +.ui-icon-seek-first { background-position: -80px -160px; } |
| | 227 | +.ui-icon-stop { background-position: -96px -160px; } |
| | 228 | +.ui-icon-eject { background-position: -112px -160px; } |
| | 229 | +.ui-icon-volume-off { background-position: -128px -160px; } |
| | 230 | +.ui-icon-volume-on { background-position: -144px -160px; } |
| | 231 | +.ui-icon-power { background-position: 0 -176px; } |
| | 232 | +.ui-icon-signal-diag { background-position: -16px -176px; } |
| | 233 | +.ui-icon-signal { background-position: -32px -176px; } |
| | 234 | +.ui-icon-battery-0 { background-position: -48px -176px; } |
| | 235 | +.ui-icon-battery-1 { background-position: -64px -176px; } |
| | 236 | +.ui-icon-battery-2 { background-position: -80px -176px; } |
| | 237 | +.ui-icon-battery-3 { background-position: -96px -176px; } |
| | 238 | +.ui-icon-circle-plus { background-position: 0 -192px; } |
| | 239 | +.ui-icon-circle-minus { background-position: -16px -192px; } |
| | 240 | +.ui-icon-circle-close { background-position: -32px -192px; } |
| | 241 | +.ui-icon-circle-triangle-e { background-position: -48px -192px; } |
| | 242 | +.ui-icon-circle-triangle-s { background-position: -64px -192px; } |
| | 243 | +.ui-icon-circle-triangle-w { background-position: -80px -192px; } |
| | 244 | +.ui-icon-circle-triangle-n { background-position: -96px -192px; } |
| | 245 | +.ui-icon-circle-arrow-e { background-position: -112px -192px; } |
| | 246 | +.ui-icon-circle-arrow-s { background-position: -128px -192px; } |
| | 247 | +.ui-icon-circle-arrow-w { background-position: -144px -192px; } |
| | 248 | +.ui-icon-circle-arrow-n { background-position: -160px -192px; } |
| | 249 | +.ui-icon-circle-zoomin { background-position: -176px -192px; } |
| | 250 | +.ui-icon-circle-zoomout { background-position: -192px -192px; } |
| | 251 | +.ui-icon-circle-check { background-position: -208px -192px; } |
| | 252 | +.ui-icon-circlesmall-plus { background-position: 0 -208px; } |
| | 253 | +.ui-icon-circlesmall-minus { background-position: -16px -208px; } |
| | 254 | +.ui-icon-circlesmall-close { background-position: -32px -208px; } |
| | 255 | +.ui-icon-squaresmall-plus { background-position: -48px -208px; } |
| | 256 | +.ui-icon-squaresmall-minus { background-position: -64px -208px; } |
| | 257 | +.ui-icon-squaresmall-close { background-position: -80px -208px; } |
| | 258 | +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } |
| | 259 | +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } |
| | 260 | +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } |
| | 261 | +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } |
| | 262 | +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } |
| | 263 | +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } |
| | 264 | + |
| | 265 | + |
| | 266 | +/* Misc visuals |
| | 267 | +----------------------------------*/ |
| | 268 | + |
| | 269 | +/* Corner radius */ |
| | 270 | +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; } |
| | 271 | +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } |
| | 272 | +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } |
| | 273 | +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } |
| | 274 | +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; } |
| | 275 | +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } |
| | 276 | +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; } |
| | 277 | +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; } |
| | 278 | +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; } |
| | 279 | + |
| | 280 | +/* Overlays */ |
| | 281 | +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } |
| | 282 | +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion |
| | 283 | +----------------------------------*/ |
| | 284 | +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } |
| | 285 | +.ui-accordion .ui-accordion-li-fix { display: inline; } |
| | 286 | +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } |
| | 287 | +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; } |
| | 288 | +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } |
| | 289 | +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; } |
| | 290 | +.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker |
| | 291 | +----------------------------------*/ |
| | 292 | +.ui-datepicker { width: 17em; padding: .2em .2em 0; } |
| | 293 | +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } |
| | 294 | +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } |
| | 295 | +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } |
| | 296 | +.ui-datepicker .ui-datepicker-prev { left:2px; } |
| | 297 | +.ui-datepicker .ui-datepicker-next { right:2px; } |
| | 298 | +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } |
| | 299 | +.ui-datepicker .ui-datepicker-next-hover { right:1px; } |
| | 300 | +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } |
| | 301 | +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } |
| | 302 | +.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; } |
| | 303 | +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} |
| | 304 | +.ui-datepicker select.ui-datepicker-month, |
| | 305 | +.ui-datepicker select.ui-datepicker-year { width: 49%;} |
| | 306 | +.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; } |
| | 307 | +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } |
| | 308 | +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } |
| | 309 | +.ui-datepicker td { border: 0; padding: 1px; } |
| | 310 | +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } |
| | 311 | +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } |
| | 312 | +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } |
| | 313 | +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } |
| | 314 | + |
| | 315 | +/* with multiple calendars */ |
| | 316 | +.ui-datepicker.ui-datepicker-multi { width:auto; } |
| | 317 | +.ui-datepicker-multi .ui-datepicker-group { float:left; } |
| | 318 | +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } |
| | 319 | +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } |
| | 320 | +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } |
| | 321 | +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } |
| | 322 | +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } |
| | 323 | +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } |
| | 324 | +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } |
| | 325 | +.ui-datepicker-row-break { clear:both; width:100%; } |
| | 326 | + |
| | 327 | +/* RTL support */ |
| | 328 | +.ui-datepicker-rtl { direction: rtl; } |
| | 329 | +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } |
| | 330 | +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } |
| | 331 | +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } |
| | 332 | +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } |
| | 333 | +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } |
| | 334 | +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } |
| | 335 | +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } |
| | 336 | +.ui-datepicker-rtl .ui-datepicker-group { float:right; } |
| | 337 | +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } |
| | 338 | +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } |
| | 339 | + |
| | 340 | +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ |
| | 341 | +.ui-datepicker-cover { |
| | 342 | + display: none; /*sorry for IE5*/ |
| | 343 | + display/**/: block; /*sorry for IE5*/ |
| | 344 | + position: absolute; /*must have*/ |
| | 345 | + z-index: -1; /*must have*/ |
| | 346 | + filter: mask(); /*must have*/ |
| | 347 | + top: -4px; /*must have*/ |
| | 348 | + left: -4px; /*must have*/ |
| | 349 | + width: 200px; /*must have*/ |
| | 350 | + height: 200px; /*must have*/ |
| | 351 | +}/* Dialog |
| | 352 | +----------------------------------*/ |
| | 353 | +.ui-dialog { position: relative; padding: .2em; width: 300px; } |
| | 354 | +.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; } |
| | 355 | +.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } |
| | 356 | +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } |
| | 357 | +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } |
| | 358 | +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } |
| | 359 | +.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } |
| | 360 | +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } |
| | 361 | +.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } |
| | 362 | +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } |
| | 363 | +.ui-draggable .ui-dialog-titlebar { cursor: move; } |
| | 364 | +/* Progressbar |
| | 365 | +----------------------------------*/ |
| | 366 | +.ui-progressbar { height:2em; text-align: left; } |
| | 367 | +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable |
| | 368 | +----------------------------------*/ |
| | 369 | +.ui-resizable { position: relative;} |
| | 370 | +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} |
| | 371 | +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } |
| | 372 | +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; } |
| | 373 | +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; } |
| | 374 | +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; } |
| | 375 | +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; } |
| | 376 | +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } |
| | 377 | +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } |
| | 378 | +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } |
| | 379 | +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider |
| | 380 | +----------------------------------*/ |
| | 381 | +.ui-slider { position: relative; text-align: left; } |
| | 382 | +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } |
| | 383 | +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; } |
| | 384 | + |
| | 385 | +.ui-slider-horizontal { height: .8em; } |
| | 386 | +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } |
| | 387 | +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } |
| | 388 | +.ui-slider-horizontal .ui-slider-range-min { left: 0; } |
| | 389 | +.ui-slider-horizontal .ui-slider-range-max { right: 0; } |
| | 390 | + |
| | 391 | +.ui-slider-vertical { width: .8em; height: 100px; } |
| | 392 | +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } |
| | 393 | +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } |
| | 394 | +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } |
| | 395 | +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs |
| | 396 | +----------------------------------*/ |
| | 397 | +.ui-tabs { padding: .2em; zoom: 1; } |
| | 398 | +.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; } |
| | 399 | +.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; } |
| | 400 | +.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; } |
| | 401 | +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; } |
| | 402 | +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } |
| | 403 | +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ |
| | 404 | +.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; } |
| | 405 | +.ui-tabs .ui-tabs-hide { display: none !important; } |
| Index: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js |
| — | — | @@ -266,7 +266,7 @@ |
| 267 | 267 | return ; |
| 268 | 268 | } |
| 269 | 269 | //check if we should use the script loader to combine all the requests into one: |
| 270 | | - if( mwSlScript ){ |
| | 270 | + if( typeof mwSlScript != 'undefined' ){ |
| 271 | 271 | var class_set = ''; |
| 272 | 272 | var last_class = ''; |
| 273 | 273 | var coma = ''; |
| — | — | @@ -375,17 +375,18 @@ |
| 376 | 376 | embedVideoCheck:function( callback ){ |
| 377 | 377 | var _this = this; |
| 378 | 378 | //issue a style sheet request (no load checks on style sheets): |
| 379 | | - if(!styleSheetPresent( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css')) |
| 380 | | - loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| | 379 | + loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| 381 | 380 | //make sure we have jQuery |
| 382 | 381 | _this.jQueryCheck(function(){ |
| 383 | 382 | _this.doLoad({ |
| 384 | 383 | 'embedVideo' : 'libEmbedVideo/mv_baseEmbed.js', |
| 385 | | - '$j.cookie' : 'jquery/jquery.ui-1.7.1/external/jquery.cookie.js', |
| | 384 | + '$j.cookie' : 'jquery/jquery.ui-1.7.1/external/cookie/jquery.cookie.js', |
| 386 | 385 | '$j.ui.mouse' : 'jquery/jquery.ui-1.7.1/ui/ui.core.js', |
| 387 | 386 | '$j.ui.droppable' : 'jquery/jquery.ui-1.7.1/ui/ui.droppable.js', |
| 388 | 387 | '$j.ui.draggable' : 'jquery/jquery.ui-1.7.1/ui/ui.draggable.js' |
| 389 | 388 | },function(){ |
| | 389 | + //set up embedTypes (load from cookie if possible) |
| | 390 | + embedTypes.init(); |
| 390 | 391 | js_log('embedVideo libs ready run callback:: '); |
| 391 | 392 | callback(); |
| 392 | 393 | }); |
| — | — | @@ -453,8 +454,7 @@ |
| 454 | 455 | //mwAddOnloadHook: ensure jQuery and the DOM are ready: |
| 455 | 456 | function mwAddOnloadHook( func ) { |
| 456 | 457 | //issue a style sheet request (no load checks on style sheets: |
| 457 | | - if(!styleSheetPresent( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css')) |
| 458 | | - loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| | 458 | + loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| 459 | 459 | //if we have already run the dom ready just run the function directly: |
| 460 | 460 | if( mvJsLoader.doneReadyEvents ){ |
| 461 | 461 | //make sure jQuery is there: |
| — | — | @@ -545,8 +545,7 @@ |
| 546 | 546 | js_log(':::::mv_do_remote_search::::'); |
| 547 | 547 | |
| 548 | 548 | //issue a load skin request: |
| 549 | | - if(!styleSheetPresent( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css')) |
| 550 | | - loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| | 549 | + loadExternalCss( mv_embed_path + 'skins/'+mv_skin_name+'/styles.css'); |
| 551 | 550 | |
| 552 | 551 | //insure we have the basic libs (jquery etc) : |
| 553 | 552 | mvJsLoader.jQueryCheck(function(){ |
| — | — | @@ -565,8 +564,7 @@ |
| 566 | 565 | function mv_do_sequence(initObj){ |
| 567 | 566 | //debugger; |
| 568 | 567 | //issue a request to get the css file (if not already included): |
| 569 | | - if(!styleSheetPresent(mv_embed_path+'skins/'+mv_skin_name+'/mv_sequence.css')) |
| 570 | | - loadExternalCss(mv_embed_path+'skins/'+mv_skin_name+'/mv_sequence.css'); |
| | 568 | + loadExternalCss(mv_embed_path+'skins/'+mv_skin_name+'/mv_sequence.css'); |
| 571 | 569 | //make sure we have the required mv_embed libs (they are not loaded when no video element is on the page) |
| 572 | 570 | mvJsLoader.embedVideoCheck(function(){ |
| 573 | 571 | //load playlist object and drag,drop,resize,hoverintent,libs |
| — | — | @@ -842,22 +840,24 @@ |
| 843 | 841 | style_elements = document.getElementsByTagName('link'); |
| 844 | 842 | if( style_elements.length > 0) { |
| 845 | 843 | for(i = 0; i < style_elements.length; i++) { |
| 846 | | - if(style_elements[i].href==url) |
| | 844 | + if(style_elements[i].href == url) |
| 847 | 845 | return true; |
| 848 | 846 | } |
| 849 | 847 | } |
| 850 | 848 | return false; |
| 851 | 849 | } |
| 852 | 850 | function loadExternalCss(url){ |
| 853 | | - if( url.indexOf('?') == -1 ){ |
| 854 | | - url+='?'+getMvUniqueReqId(); |
| | 851 | + if( !styleSheetPresent(url) ){ |
| | 852 | + if( url.indexOf('?') == -1 ){ |
| | 853 | + url+='?'+getMvUniqueReqId(); |
| | 854 | + } |
| | 855 | + js_log('load css: ' + url); |
| | 856 | + var e = document.createElement("link"); |
| | 857 | + e.href = url; |
| | 858 | + e.type = "text/css"; |
| | 859 | + e.rel = 'stylesheet'; |
| | 860 | + document.getElementsByTagName("head")[0].appendChild(e); |
| 855 | 861 | } |
| 856 | | - js_log('load css: ' + url); |
| 857 | | - var e = document.createElement("link"); |
| 858 | | - e.href = url; |
| 859 | | - e.type = "text/css"; |
| 860 | | - e.rel = 'stylesheet'; |
| 861 | | - document.getElementsByTagName("head")[0].appendChild(e); |
| 862 | 862 | } |
| 863 | 863 | function getMvEmbedURL(){ |
| 864 | 864 | if( _global['mv_embed_url'] ) |
| — | — | @@ -883,17 +883,19 @@ |
| 884 | 884 | if( _global['urid'] ) |
| 885 | 885 | return _global['urid']; |
| 886 | 886 | var mv_embed_url = getMvEmbedURL(); |
| 887 | | - //if in debug mode get a fresh unique request key: |
| 888 | | - if( parseUri( mv_embed_url ).queryKey['debug'] == 'true'){ |
| 889 | | - var d = new Date(); |
| 890 | | - return d.getTime() |
| 891 | | - } |
| 892 | 887 | //if we have a uri retun that: |
| 893 | 888 | var urid = parseUri( mv_embed_url).queryKey['urid'] |
| 894 | 889 | if( urid ){ |
| 895 | 890 | _global['urid'] = urid; |
| 896 | 891 | return urid; |
| 897 | 892 | } |
| | 893 | + //if in debug mode get a fresh unique request key: |
| | 894 | + if( parseUri( mv_embed_url ).queryKey['debug'] == 'true'){ |
| | 895 | + var d = new Date(); |
| | 896 | + var urid = d.getTime(); |
| | 897 | + _global['urid'] = urid; |
| | 898 | + return urid; |
| | 899 | + } |
| 898 | 900 | //else just return the mv_embed version; |
| 899 | 901 | return MV_EMBED_VERSION; |
| 900 | 902 | } |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_baseEmbed.js |
| — | — | @@ -2472,7 +2472,7 @@ |
| 2473 | 2473 | }, |
| 2474 | 2474 | loadPreferences : function() |
| 2475 | 2475 | { |
| 2476 | | - this.preference = new Object(); |
| | 2476 | + this.preference = new Object(); |
| 2477 | 2477 | // see if we have a cookie set to a clientSupported type: |
| 2478 | 2478 | var cookieVal = $j.cookie( 'ogg_player_exp' ); |
| 2479 | 2479 | if (cookieVal) |
| — | — | @@ -2682,6 +2682,4 @@ |
| 2683 | 2683 | } |
| 2684 | 2684 | return hasObj; |
| 2685 | 2685 | } |
| 2686 | | -} |
| 2687 | | -//set up embedTypes |
| 2688 | | -embedTypes.init(); |
| | 2686 | +} |
| \ No newline at end of file |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_omtkEmbed.js |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | instanceOf:'omtkEmbed', |
| 4 | 4 | supports: { |
| 5 | 5 | 'pause':true, |
| 6 | | - 'time_display':true |
| | 6 | + 'time_display':true |
| 7 | 7 | }, |
| 8 | 8 | getEmbedHTML : function (){ |
| 9 | 9 | var embed_code = this.getEmbedObj(); |
| — | — | @@ -62,4 +62,4 @@ |
| 63 | 63 | |
| 64 | 64 | function OMTK_P_metadataUpdate(){ |
| 65 | 65 | js_log('OMTK_P_metadataUpdate'); |
| 66 | | -} |
| \ No newline at end of file |
| | 66 | +} |
| Index: branches/new-upload/phase3/js2/mwEmbed/jsScriptLoader.php |
| — | — | @@ -203,7 +203,7 @@ |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | function doProccessJsFile( $file_name ){ |
| 207 | | - global $IP, $wgEnableScriptLocalization, $IP, $mwEmbedDirectory; |
| | 207 | + global $IP, $wgEnableScriptLocalization, $IP; |
| 208 | 208 | |
| 209 | 209 | //load the file: |
| 210 | 210 | $str = @file_get_contents("{$IP}/{$file_name}"); |
| Index: branches/new-upload/phase3/includes/DefaultSettings.php |
| — | — | @@ -2587,8 +2587,16 @@ |
| 2588 | 2588 | /* |
| 2589 | 2589 | * path for mwEmbed normally js2/mwEmbed/ |
| 2590 | 2590 | */ |
| 2591 | | -$mwEmbedDirectory = "js2/mwEmbed/"; |
| | 2591 | +$wgMwEmbedDirectory = "js2/mwEmbed/"; |
| 2592 | 2592 | |
| | 2593 | +/* |
| | 2594 | + * wgDebugJavaScript used to turn on debuging for the javascript script-loader |
| | 2595 | + * & forces fresh copies of javascript if the script loader is offf |
| | 2596 | + */ |
| | 2597 | + |
| | 2598 | +$wgDebugJavaScript = false; |
| | 2599 | + |
| | 2600 | + |
| 2593 | 2601 | /** |
| 2594 | 2602 | * An array of extension types and inside that their names, versions, authors, |
| 2595 | 2603 | * urls, descriptions and pointers to localized description msgs. Note that |
| Index: branches/new-upload/phase3/includes/OutputPage.php |
| — | — | @@ -149,7 +149,7 @@ |
| 150 | 150 | Xml::element( 'script', |
| 151 | 151 | array( |
| 152 | 152 | 'type' => $wgJsMimeType, |
| 153 | | - 'src' => "$path?$wgStyleVersion", |
| | 153 | + 'src' => "$path?" . $this->getURIDparam(), |
| 154 | 154 | ), |
| 155 | 155 | '', false |
| 156 | 156 | ) |
| — | — | @@ -172,7 +172,7 @@ |
| 173 | 173 | if(isset( $wgJSAutoloadLocalClasses[$s] )){ |
| 174 | 174 | $so.= Xml::element( 'script', array( |
| 175 | 175 | 'type' => $wgJsMimeType, |
| 176 | | - 'src' => "{$wgScriptPath}/{$wgJSAutoloadLocalClasses[$s]}?$wgStyleVersion", |
| | 176 | + 'src' => "{$wgScriptPath}/{$wgJSAutoloadLocalClasses[$s]}?" . $this->getURIDparam() |
| 177 | 177 | ), |
| 178 | 178 | '', false |
| 179 | 179 | ); |
| — | — | @@ -214,7 +214,7 @@ |
| 215 | 215 | * |
| 216 | 216 | */ |
| 217 | 217 | function getScriptLoaderJs( $forceClassAry=false ){ |
| 218 | | - global $wgScriptPath, $wgJsMimeType, $wgStyleVersion, $wgRequest; |
| | 218 | + global $wgScriptPath, $wgJsMimeType, $wgStyleVersion, $wgRequest, $wgDebugJavaScript; |
| 219 | 219 | |
| 220 | 220 | if(!$forceClassAry){ |
| 221 | 221 | $class_list = implode(',', $this->mScriptLoaderClassList ); |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | $class_list = implode(',', $forceClassAry ); |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | | - $debug_param = ( $mvgJSDebug || |
| | 226 | + $debug_param = ( $wgDebugJavaScript || |
| 227 | 227 | $wgRequest->getVal('debug')=='true' || |
| 228 | 228 | $wgRequest->getVal('debug')=='1' ) |
| 229 | 229 | ? '&debug=true' : ''; |
| — | — | @@ -231,20 +231,24 @@ |
| 232 | 232 | //@@todo we should check the packaged message text in this javascript file for updates and update the $mScriptLoaderURID id (in getJsClassFromPath) |
| 233 | 233 | |
| 234 | 234 | //generate the unique request param (combine with the most recent revision id of any wiki page with the $wgStyleVersion var) |
| 235 | | - if( $this->debug ){ |
| 236 | | - $urid_param = "&urid=". time(); |
| 237 | | - }else{ |
| 238 | | - $urid_param = "&urid={$wgStyleVersion}_{$this->mLatestScriptRevID}"; |
| 239 | | - } |
| | 235 | + |
| 240 | 236 | |
| 241 | 237 | return Xml::element( 'script', |
| 242 | 238 | array( |
| 243 | 239 | 'type' => $wgJsMimeType, |
| 244 | | - 'src' => "$wgScriptPath/mwScriptLoader.php?class={$class_list}{$debug_param}{$urid_param}", |
| | 240 | + 'src' => "$wgScriptPath/mwScriptLoader.php?class={$class_list}{$debug_param}&".$this->getURIDparam(), |
| 245 | 241 | ), |
| 246 | 242 | '', false |
| 247 | 243 | ); |
| 248 | 244 | } |
| | 245 | + function getURIDparam(){ |
| | 246 | + global $wgDebugJavaScript,$wgStyleVersion; |
| | 247 | + if( $wgDebugJavaScript ){ |
| | 248 | + return "urid=". time(); |
| | 249 | + }else{ |
| | 250 | + return "urid={$wgStyleVersion}_{$this->mLatestScriptRevID}"; |
| | 251 | + } |
| | 252 | + } |
| 249 | 253 | function getJsClassFromPath( $path ){ |
| 250 | 254 | global $wgJSAutoloadClasses, $wgJSAutoloadLocalClasses, $wgScriptPath; |
| 251 | 255 | |
| Index: branches/new-upload/phase3/includes/AutoLoader.php |
| — | — | @@ -584,8 +584,8 @@ |
| 585 | 585 | ); |
| 586 | 586 | |
| 587 | 587 | //add the mwEmbed set of classes that we want to expose: (could be conditional) |
| 588 | | -//@@todo move jsAutoloadLocalClasses.php to post Setup so we have $mwEmbedDirectory var |
| 589 | | -$mwEmbedDirectory = "js2/mwEmbed/"; |
| | 588 | +//@@todo move jsAutoloadLocalClasses.php to post Setup so we have $wgMwEmbedDirectory var |
| | 589 | +$wgMwEmbedDirectory = "js2/mwEmbed/"; |
| 590 | 590 | require_once("$IP/js2/mwEmbed/php/jsAutoloadLocalClasses.php"); |
| 591 | 591 | |
| 592 | 592 | class AutoLoader { |