r72245 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r72244‎ \| r72245 \| r72246 >
Date:	23:41, 2 September 2010
Author:	dale
Status:	deferred
Tags:
Comment:	update mwEmbed library to use jquery ui 1.8.4
Modified paths:	/branches/MwEmbedStandAlone/loader.js (modified) (history) /branches/MwEmbedStandAlone/modules/AddMedia/loader.js (modified) (history) /branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js (modified) (history) /branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/loader.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerAddByUrl.js (modified) (history) /branches/MwEmbedStandAlone/modules/TimedText/loader.js (modified) (history) /branches/MwEmbedStandAlone/mwEmbed.js (modified) (history)

Diff [purge]

Index: branches/MwEmbedStandAlone/loader.js
—	—	@@ -135,7 +135,7 @@
136	136
137	137	"$j.fn.hoverIntent" : "libraries/jquery/plugins/jquery.hoverIntent.js",
138	138	"$j.fn.datePicker" : "libraries/jquery/plugins/jquery.datePicker.js",
139		~~- "$j.ui" : "libraries/jquery/jquery.ui/ui/ui.core.js",~~
	139	+
140	140
141	141	"mw.style.ui_redmond" : "skins/jquery.ui.themes/redmond/jquery-ui-1.7.2.css",
142	142	"mw.style.ui_darkness" : "skins/jquery.ui.themes/darkness/jquery-ui-1.7.2.css",
—	—	@@ -146,38 +146,47 @@
147	147	"mw.style.mwCommon" : "skins/common/mw.style.mwCommon.css",
148	148
149	149	"$j.cookie" : "libraries/jquery/plugins/jquery.cookie.js",
150		-
	150	+
151	151	"$j.contextMenu" : "libraries/jquery/plugins/jquery.contextMenu.js",
152	152	"$j.fn.suggestions" : "libraries/jquery/plugins/jquery.suggestions.js",
153	153	"$j.fn.textSelection" : "libraries/jquery/plugins/jquery.textSelection.js",
154	154	"$j.browserTest" : "libraries/jquery/plugins/jquery.browserTest.js",
155	155	"$j.fn.jWizard" : "libraries/jquery/plugins/jquery.jWizard.js",
156	156
157		~~- "$j.effects.blind" : "libraries/jquery/jquery.ui/ui/effects.blind.js",~~
158		~~- "$j.effects.drop" : "libraries/jquery/jquery.ui/ui/effects.drop.js",~~
159		~~- "$j.effects.pulsate" : "libraries/jquery/jquery.ui/ui/effects.pulsate.js",~~
160		~~- "$j.effects.transfer" : "libraries/jquery/jquery.ui/ui/effects.transfer.js",~~
161		~~- "$j.ui.droppable" : "libraries/jquery/jquery.ui/ui/ui.droppable.js",~~
162		~~- "$j.ui.slider" : "libraries/jquery/jquery.ui/ui/ui.slider.js",~~
163		~~- "$j.effects.bounce" : "libraries/jquery/jquery.ui/ui/effects.bounce.js",~~
164		~~- "$j.effects.explode" : "libraries/jquery/jquery.ui/ui/effects.explode.js",~~
165		~~- "$j.effects.scale" : "libraries/jquery/jquery.ui/ui/effects.scale.js",~~
166		~~- "$j.ui.datepicker" : "libraries/jquery/jquery.ui/ui/ui.datepicker.js",~~
167		~~- "$j.ui.progressbar" : "libraries/jquery/jquery.ui/ui/ui.progressbar.js",~~
168		~~- "$j.ui.sortable" : "libraries/jquery/jquery.ui/ui/ui.sortable.js",~~
169		~~- "$j.effects.clip" : "libraries/jquery/jquery.ui/ui/effects.clip.js",~~
170		~~- "$j.effects.fold" : "libraries/jquery/jquery.ui/ui/effects.fold.js",~~
171		~~- "$j.effects.shake" : "libraries/jquery/jquery.ui/ui/effects.shake.js",~~
172		~~- "$j.ui.dialog" : "libraries/jquery/jquery.ui/ui/ui.dialog.js",~~
173		~~- "$j.ui.resizable" : "libraries/jquery/jquery.ui/ui/ui.resizable.js",~~
174		~~- "$j.ui.tabs" : "libraries/jquery/jquery.ui/ui/ui.tabs.js",~~
175		~~- "$j.effects" : "libraries/jquery/jquery.ui/ui/effects.core.js",~~
176		~~- "$j.effects.highlight" : "libraries/jquery/jquery.ui/ui/effects.highlight.js",~~
177		~~- "$j.effects.slide" : "libraries/jquery/jquery.ui/ui/effects.slide.js",~~
178		~~- "$j.ui.accordion" : "libraries/jquery/jquery.ui/ui/ui.accordion.js",~~
179		~~- "$j.ui.draggable" : "libraries/jquery/jquery.ui/ui/ui.draggable.js",~~
180		~~- "$j.ui.selectable" : "libraries/jquery/jquery.ui/ui/ui.selectable.js"~~
181		-
	157	+ "$j.ui" : "libraries/jquery/jquery.ui/ui/jquery.ui.core.js",
	158	+ "$j.widget" : "libraries/jquery/jquery.ui/ui/jquery.ui.widget.js",
	159	+
	160	+ "$j.effects.blind" : "libraries/jquery/jquery.ui/ui/jquery.effects.blind.js",
	161	+ "$j.effects.bounce" : "libraries/jquery/jquery.ui/ui/jquery.effects.bounce.js",
	162	+ "$j.effects.clip" : "libraries/jquery/jquery.ui/ui/jquery.effects.clip.js",
	163	+ "$j.effects" : "libraries/jquery/jquery.ui/ui/jquery.effects.core.js",
	164	+ "$j.effects.drop" : "libraries/jquery/jquery.ui/ui/jquery.effects.drop.js",
	165	+ "$j.effects.explode" : "libraries/jquery/jquery.ui/ui/jquery.effects.explode.js",
	166	+ "$j.effects.fold" : "libraries/jquery/jquery.ui/ui/jquery.effects.fold.js",
	167	+ "$j.effects.highlight" : "libraries/jquery/jquery.ui/ui/jquery.effects.highlight.js",
	168	+ "$j.effects.pulsate" : "libraries/jquery/jquery.ui/ui/jquery.effects.pulsate.js",
	169	+ "$j.effects.scale" : "libraries/jquery/jquery.ui/ui/jquery.effects.scale.js",
	170	+ "$j.effects.shake" : "libraries/jquery/jquery.ui/ui/jquery.effects.shake.js",
	171	+ "$j.effects.slide" : "libraries/jquery/jquery.ui/ui/jquery.effects.slide.js",
	172	+ "$j.effects.transfer" : "libraries/jquery/jquery.ui/ui/jquery.effects.transfer.js",
	173	+
	174	+ "$j.ui.accordion" : "libraries/jquery/jquery.ui/ui/jquery.ui.accordion.js",
	175	+ "$j.ui.autocomplete" : "libraries/jquery/jquery.ui/ui/jquery.ui.autocomplete.js",
	176	+ "$j.ui.button" : "libraries/jquery/jquery.ui/ui/jquery.ui.button.js",
	177	+ "$j.ui.datepicker" : "libraries/jquery/jquery.ui/ui/jquery.ui.datepicker.js",
	178	+ "$j.ui.dialog" : "libraries/jquery/jquery.ui/ui/jquery.ui.dialog.js",
	179	+ "$j.ui.droppable" : "libraries/jquery/jquery.ui/ui/jquery.ui.droppable.js",
	180	+ "$j.ui.draggable" : "libraries/jquery/jquery.ui/ui/jquery.ui.draggable.js",
	181	+ "$j.ui.mouse" : "libraries/jquery/jquery.ui/ui/jquery.ui.mouse.js",
	182	+ "$j.ui.position" : "libraries/jquery/jquery.ui/ui/jquery.ui.position.js",
	183	+ "$j.ui.progressbar" : "libraries/jquery/jquery.ui/ui/jquery.ui.progressbar.js",
	184	+ "$j.ui.resizable" : "libraries/jquery/jquery.ui/ui/jquery.ui.resizable.js",
	185	+ "$j.ui.selectable" : "libraries/jquery/jquery.ui/ui/jquery.ui.selectable.js",
	186	+ "$j.ui.slider" : "libraries/jquery/jquery.ui/ui/jquery.ui.slider.js",
	187	+ "$j.ui.sortable" : "libraries/jquery/jquery.ui/ui/jquery.ui.sortable.js",
	188	+ "$j.ui.tabs" : "libraries/jquery/jquery.ui/ui/jquery.ui.tabs.js"
	189	+
	190	+
182	191	} );
183	192
184	193	// Add a special css dependency for $j.ui
Index: branches/MwEmbedStandAlone/mwEmbed.js
—	—	@@ -1105,7 +1105,8 @@
1106	1106	// Build the uiRequest
1107	1107	var uiRequest = [ '$j.ui.dialog' ];
1108	1108	if( options.draggable ){
1109		~~- uiRequest.push( '$j.ui.draggable' )~~
	1109	+ uiRequest.push( '$j.ui.mouse' )
	1110	+ uiRequest.push( '$j.ui.draggable' )
1110	1111	}
1111	1112	if( options.resizable ){
1112	1113	uiRequest.push( '$j.ui.resizable' );
—	—	@@ -1123,7 +1124,8 @@
1124	1125	// Load the dialog resources
1125	1126	mw.load([
1126	1127	[
1127		~~- '$j.ui'~~
	1128	+ '$j.ui',
	1129	+ '$j.widget'
1128	1130	],
1129	1131	uiRequest
1130	1132	], function() {
—	—	@@ -1135,11 +1137,11 @@
1136	1138	/**
1137	1139	* Mobile Safari has special properties for html5 video::
1138	1140	*
1139		~~- * NOTE: should be moved to browser detection script~~
	1141	+ * NOTE: should be phased out in favor of browser feature detection script
1140	1142	*/
1141	1143	mw.isMobileSafari = function() {
1142	1144	// check mobile safari foce ( for debug )
1143		~~- if( mw.getConfig( 'forceMobileSafari' ) ){~~
	1145	+ if( mw.getConfig( 'forceMobileSafari' ) \|\| document.URL.indexOf('forceMobileSafari') != -1 ){
1144	1146	return true;
1145	1147	}
1146	1148	if ((navigator.userAgent.indexOf('iPhone') != -1) \|\|
Index: branches/MwEmbedStandAlone/modules/TimedText/loader.js
—	—	@@ -81,6 +81,7 @@
82	82	mw.addModuleLoader( 'TimedText.Edit', [
83	83	[
84	84	'$j.ui',
	85	+ '$j.widget',
85	86	'$j.fn.menu',
86	87	"mw.style.jquerymenu",
87	88
Index: branches/MwEmbedStandAlone/modules/AddMedia/loader.js
—	—	@@ -38,7 +38,8 @@
39	39	mw.addModuleLoader( 'AddMedia.UploadForm', [
40	40	[
41	41	'mw.UploadForm',
42		~~- '$j.ui'~~
	42	+ '$j.ui',
	43	+ '$j.widget'
43	44	],
44	45	[
45	46	'$j.ui.datepicker'
—	—	@@ -58,6 +59,7 @@
59	60	'$j.ui'
60	61	], [
61	62	'$j.ui.resizable',
	63	+ '$j.ui.mouse',
62	64	'$j.ui.draggable',
63	65	'$j.ui.dialog',
64	66	'$j.ui.tabs',
—	—	@@ -75,6 +77,7 @@
76	78	[
77	79	'$j.ui.progressbar',
78	80	'$j.ui.dialog',
	81	+ '$j.ui.mouse',
79	82	'$j.ui.draggable'
80	83	]
81	84	];
Index: branches/MwEmbedStandAlone/modules/AjaxCategories/mw.AjaxCategories.js
—	—	@@ -108,7 +108,8 @@
109	109	// Make sure the suggestion plugin is loaded. Load everything else while we're at it
110	110	mw.load(
111	111	[
112		~~- '$j.ui',~~
	112	+ '$j.ui',
	113	+ '$j.widget',
113	114	'$j.ui.dialog',
114	115	'$j.fn.suggestions'
115	116	],
Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js
—	—	@@ -156,7 +156,8 @@
157	157	// Set up the embed video player class request: (include the skin js as well)
158	158	var dependencyRequest = [
159	159	[
160		~~- '$j.ui',~~
	160	+ '$j.ui',
	161	+ '$j.widget',
161	162	'mw.EmbedPlayer',
162	163	'mw.PlayerControlBuilder',
163	164	'$j.fn.hoverIntent',
—	—	@@ -166,6 +167,7 @@
167	168	'JSON'
168	169	],
169	170	[
	171	+ '$j.ui.mouse',
170	172	'$j.fn.menu',
171	173	'mw.style.jquerymenu',
172	174	'$j.ui.slider'
Index: branches/MwEmbedStandAlone/modules/Sequencer/loader.js
—	—	@@ -85,7 +85,9 @@
86	86	[
87	87
88	88	'$j.fn.layout',
	89	+
89	90	// UI components used in the sequencer interface:
	91	+ '$j.ui.mouse',
90	92	'$j.ui.accordion',
91	93	'$j.ui.dialog',
92	94	'$j.ui.droppable',
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerAddByUrl.js
—	—	@@ -75,34 +75,26 @@
76	76	});
77	77	});
78	78	} else if( titleKey.indexOf('Template:') == 0 ) {
79		~~- // get parsed page text~~
80		~~- var request ={~~
81		~~- 'action':'parse',~~
82		~~- 'page' : titleKey~~
	79	+ // Parse any paramters we can find:
	80	+ var apiProvider = '';
	81	+ if( mw.parseUri(provider.apiUrl ).host == 'commons.wikimedia.org' ){
	82	+ apiProvider = 'commons'
	83	+ } else {
	84	+ // xxx we need to abstract the remoteSearch driver provider logic
	85	+ // into a provider class
	86	+ apiProvider = 'local';
83	87	}
84		~~- // should maybe~~
85		~~- mw.getJSON( provider.apiUrl, request, function( data ){~~
86		~~- if( !data \|\| !data.parse \|\| !data.parse.text \|\| !data.parse.text['*'] ){~~
87		~~- $dialog.html( 'Error loading asset');~~
88		~~- return ;~~
89		~~- }~~
90		~~- var apiProvider = '';~~
91		~~- if( mw.parseUri( _this.getApiUrl() ).host == 'commons.wikimedia.org' ){~~
92		~~- apiProvider = 'commons'~~
93		~~- } else {~~
94		~~- // xxx we need to abstract the remoteSearch driver provider logic~~
95		~~- // into a provider class~~
96		~~- apiProvider = 'local';~~
97		~~- }~~
98		~~- // Get the rendered page text:~~
99		~~- _this~~
100		~~- .sequencer~~
101		~~- .getAddMedia()~~
102		~~- .getSmilClipFromWikiTemplate( titleKey, apiProvider, function( smilClip ){~~
103		~~- _this.sequencer.getTimeline().insertSmilClipEdit( smilClip );~~
104		~~- mw.closeLoaderDialog();~~
105		~~- });~~
106		~~- })~~
	88	+ // Get the rendered page text:
	89	+ var smilClip = _this
	90	+ .sequencer
	91	+ .getAddMedia()
	92	+ .getSmilClipFromWikiTemplate( titleKey, apiProvider );
	93	+
	94	+ // Add the smil clip to the sequencer
	95	+ _this.sequencer.getTimeline().insertSmilClipEdit( smilClip );
	96	+
	97	+ // Close the dialog loading:
	98	+ mw.closeLoaderDialog();
107	99	}
108	100
109	101	});

Status & tagging log

13:59, 3 September 2010 😂 (talk | contribs) changed the status of r72245 [removed: new added: deferred]