http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72330
Revision: 72330
Author: dale
Date: 2010-09-03 22:58:54 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
updated AMW to work with jquery ui 1.8
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/AddMedia/loader.js
branches/MwEmbedStandAlone/modules/AddMedia/mw.RemoteSearchDriver.js
branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
branches/MwEmbedStandAlone/modules/Sequencer/loader.js
branches/MwEmbedStandAlone/modules/TimedText/loader.js
branches/MwEmbedStandAlone/modules/UploadWizard/loader.js
branches/MwEmbedStandAlone/mwEmbed.js
branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/AddMedia/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/AddMedia/loader.js 2010-09-03
22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/AddMedia/loader.js 2010-09-03
22:58:54 UTC (rev 72330)
@@ -60,6 +60,8 @@
], [
'$j.ui.resizable',
'$j.ui.mouse',
+ '$j.widget',
+ '$j.ui.position',
'$j.ui.draggable',
'$j.ui.dialog',
'$j.ui.tabs',
@@ -72,12 +74,14 @@
[
'mw.UploadHandler',
'mw.UploadInterface',
- '$j.ui'
+ '$j.ui',
+ '$j.widget'
],
[
'$j.ui.progressbar',
+ '$j.ui.position',
+ '$j.ui.mouse',
'$j.ui.dialog',
- '$j.ui.mouse',
'$j.ui.draggable'
]
];
Modified: branches/MwEmbedStandAlone/modules/AddMedia/mw.RemoteSearchDriver.js
===================================================================
--- branches/MwEmbedStandAlone/modules/AddMedia/mw.RemoteSearchDriver.js
2010-09-03 22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/AddMedia/mw.RemoteSearchDriver.js
2010-09-03 22:58:54 UTC (rev 72330)
@@ -850,14 +850,8 @@
.attr({
'id' : 'rsd_modal_target',
'title' : gM( 'mwe-add_media_wizard' )
- })
- .css( {
- 'position' : 'absolute',
- 'top' : '3em',
- 'left' : '0px',
- 'bottom' : '3em',
- 'right' : '0px'
- })
+ })
+ .css("position", 'relative')
);
// Get layout
mw.log( 'width: ' + $j( window ).width() + ' height: ' + $j(
window ).height() );
@@ -872,6 +866,9 @@
bgiframe: true,
autoOpen: true,
modal: true,
+ width: $j(window).width()-10,
+ height: $j(window).height()-10,
+ position : 'center',
draggable: false,
resizable: false,
buttons: cancelButton,
@@ -882,7 +879,7 @@
$j( this ).parents( '.ui-dialog' ).fadeOut(
'slow' );
}
} );
- $j( _this.target_container ).dialogFitWindow();
+ //$j( _this.target_container ).dialogFitWindow();
// Add the window resize hook to keep dialog layout
$j( window ).resize( function() {
Modified: branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js
===================================================================
--- branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js
2010-09-03 22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js
2010-09-03 22:58:54 UTC (rev 72330)
@@ -110,6 +110,7 @@
[
'$j.ui',
'$j.widget',
+ '$j.ui.position',
'$j.ui.dialog',
'$j.fn.suggestions'
],
@@ -167,7 +168,7 @@
confirmEdit : function( page, fn, actionSummary, doneFn ) {
// Load jQuery UI
mw.load(
- ['$j.ui', '$j.ui.dialog', '$j.fn.suggestions'],
+ ['$j.ui', '$j.ui.position', '$j.ui.dialog',
'$j.fn.suggestions'],
function() {
// Produce a confirmation dialog
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-03 22:58:09 UTC (rev 72329)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-03 22:58:54 UTC (rev 72330)
@@ -167,6 +167,7 @@
float: left;
font-size: 11px;
padding: 13px 10px 15px 15px;
+ overflow-y:scroll;
}
.k-player ul.k-menu-bar {
Modified: branches/MwEmbedStandAlone/modules/Sequencer/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-09-03
22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-09-03
22:58:54 UTC (rev 72330)
@@ -89,6 +89,7 @@
// UI components used in the sequencer
interface:
'$j.ui.mouse',
'$j.widget',
+ '$j.ui.position',
'$j.ui.accordion',
'$j.ui.dialog',
'$j.ui.droppable',
Modified: branches/MwEmbedStandAlone/modules/TimedText/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/loader.js 2010-09-03
22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/TimedText/loader.js 2010-09-03
22:58:54 UTC (rev 72330)
@@ -82,6 +82,7 @@
[
'$j.ui',
'$j.widget',
+ '$j.ui.position',
'$j.fn.menu',
"mw.style.jquerymenu",
Modified: branches/MwEmbedStandAlone/modules/UploadWizard/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/UploadWizard/loader.js 2010-09-03
22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/modules/UploadWizard/loader.js 2010-09-03
22:58:54 UTC (rev 72330)
@@ -61,6 +61,8 @@
var libraries = [
[
'$j.ui',
+ '$j.widget',
+ '$j.ui.position',
'$j.ui.progressbar',
'$j.ui.dialog',
'$j.ui.draggable',
Modified: branches/MwEmbedStandAlone/mwEmbed.js
===================================================================
--- branches/MwEmbedStandAlone/mwEmbed.js 2010-09-03 22:58:09 UTC (rev
72329)
+++ branches/MwEmbedStandAlone/mwEmbed.js 2010-09-03 22:58:54 UTC (rev
72330)
@@ -1124,7 +1124,8 @@
mw.load([
[
'$j.ui',
- '$j.widget'
+ '$j.widget',
+ '$j.ui.position'
],
uiRequest
], function() {
Modified: branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
2010-09-03 22:58:09 UTC (rev 72329)
+++ branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
2010-09-03 22:58:54 UTC (rev 72330)
@@ -88,6 +88,6 @@
} );
}
}
- }, 120 )
+ }, 100 )
} );
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-03 22:58:09 UTC
(rev 72329)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-03 22:58:54 UTC
(rev 72330)
@@ -67,9 +67,6 @@
}
-
-
-
/*******************************
* Wikimedia specific config
********************************/
@@ -77,13 +74,6 @@
mw.setConfig( 'SwarmTransport.Enable', true );
mw.setConfig( 'SmilPlayer.AssetDomainWhiteList', ['upload.wikimedia.org'] );
-
-
-
-
-
-
-
// Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded )
addOnloadHook( function() {
doPageSpecificRewrite();
@@ -190,6 +180,8 @@
'mw.UploadInterface',
'mw.Firefogg',
'$j.ui',
+ '$j.widget',
+ '$j.ui.position',
'$j.ui.progressbar',
'$j.ui.dialog',
'$j.ui.draggable'
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
