http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66289
Revision: 66289
Author: dale
Date: 2010-05-12 19:50:33 +0000 (Wed, 12 May 2010)
Log Message:
-----------
stand alone mwEmbed sync with extension based version[s] r66288
Modified Paths:
--------------
branches/MwEmbedStandAlone/includes/jsClassLoader.php
branches/MwEmbedStandAlone/includes/maintenance/mergeJavascriptMsg.php
branches/MwEmbedStandAlone/includes/noMediaWikiConfig.php
branches/MwEmbedStandAlone/jsScriptLoader.php
branches/MwEmbedStandAlone/languages/mwEmbed.i18n.php
branches/MwEmbedStandAlone/loader.js
branches/MwEmbedStandAlone/modules/ApiProxy/loader.js
branches/MwEmbedStandAlone/skins/README
branches/MwEmbedStandAlone/tests/Add_Media_Wizard.html
Added Paths:
-----------
branches/MwEmbedStandAlone/libraries/
branches/MwEmbedStandAlone/libraries/jquery/
branches/MwEmbedStandAlone/libraries/json/
branches/MwEmbedStandAlone/libraries/json/json2.js
Removed Paths:
-------------
branches/MwEmbedStandAlone/jquery/
Modified: branches/MwEmbedStandAlone/includes/jsClassLoader.php
===================================================================
--- branches/MwEmbedStandAlone/includes/jsClassLoader.php 2010-05-12
19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/includes/jsClassLoader.php 2010-05-12
19:50:33 UTC (rev 66289)
@@ -37,11 +37,16 @@
return false;
}
self::$classesLoaded = true;
+ // Start the profiler if running
+ $fname = 'jsClassLoader::loadClassPaths';
+ wfProfileIn( $fname );
+
$mwEmbedAbsolutePath = ( $wgMwEmbedDirectory == '' ) ? $IP :
$IP .'/' .$wgMwEmbedDirectory;
// Add the mwEmbed localizations
$wgExtensionMessagesFiles[ 'mwEmbed' ] = $mwEmbedAbsolutePath .
'/languages/mwEmbed.i18n.php';
+
// Load javascript classes from mwEmbed.js
if ( !is_file( $mwEmbedAbsolutePath . '/loader.js' ) ) {
// throw error no mwEmbed found
@@ -79,9 +84,11 @@
// Get all the extension loader paths registered mwEmbed modules
foreach( $wgExtensionJavascriptLoader as $na => $loaderPath){
// Setup the directory context for extensions relative
to loader.js file:
- $modulePath = str_replace('loader.js', '' ,
$loaderPath);
+ $modulePath = str_replace('/loader.js', '' ,
$loaderPath);
self::proccessModulePath( $modulePath );
}
+
+ wfProfileOut( $fname );
}
/**
* Process a loader path, passes off to proccessLoaderContent
@@ -90,6 +97,7 @@
*/
private static function proccessModulePath( $path ){
global $wgExtensionMessagesFiles;
+
// Get the module name
$moduleName = end( explode('/', $path ) );
@@ -97,8 +105,8 @@
self::$directoryContext = $path;
// Check for the loader.js
- if( !is_file( $path . '/loader.js' ) ){
- throw new MWException( "Module missing loader.js in
root \n" );
+ if( !is_file( $path . '/loader.js' ) ){
+ throw new MWException( "Javascript Module $moduleName
missing loader.js file\n" );
return false;
}
@@ -153,7 +161,7 @@
*
* @return String combined component javascript
*/
- public static function getCombinedComponentJs( $scriptLoader ){
+ public static function getCombinedComponentJs( $scriptLoader ) {
self::loadClassPaths();
$jsOut = '';
foreach( self::$coreComponentsList as $componentClassName ) {
@@ -189,7 +197,6 @@
return self::$coreComponentsList;
}
-
/**
* Build a list of components to be included with mwEmbed
*/
Modified: branches/MwEmbedStandAlone/includes/maintenance/mergeJavascriptMsg.php
===================================================================
--- branches/MwEmbedStandAlone/includes/maintenance/mergeJavascriptMsg.php
2010-05-12 19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/includes/maintenance/mergeJavascriptMsg.php
2010-05-12 19:50:33 UTC (rev 66289)
@@ -19,8 +19,6 @@
$mwSTART_MSG_KEY = '$messages[\'en\'] = array(';
$mwEND_MSG_KEY = ',
);';
-$mwLangFilePath = '../../languages/mwEmbed.i18n.php';
-include_once( $mwLangFilePath );
function print_help(){
?>
@@ -29,9 +27,8 @@
-j merges javascript msgs into php
-p merges php msgs back into javascript
-q will disable screen output and wait time
-
+ --modpath [/path/to/module/folder] path to a module folder to be updated
<?php
-die();
}
// Get options ( like override JS or override PHP )
@@ -49,11 +46,12 @@
$mergeToJS = true;
}else if( $arg == '-q'){
$showInfo = false;
- }else{
+ }else if( $arg == '--modpath' ){
print_help();
}
}
+die();
if($showInfo){
if ( $mergeToPhp )
@@ -75,8 +73,9 @@
$startInx = strpos( $rawLangFile, $mwSTART_MSG_KEY ) + strlen(
$mwSTART_MSG_KEY );
$endInx = strpos( $rawLangFile, $mwEND_MSG_KEY ) + 1;
if ( $startInx === false || $endInx === false ) {
- if($showInfo)
+ if( $showInfo ) {
print "Could not find $mwSTART_MSG_KEY or $mwEND_MSG_KEY in
mwEmbed.i18n.php\n";
+ }
exit();
}
Modified: branches/MwEmbedStandAlone/includes/noMediaWikiConfig.php
===================================================================
--- branches/MwEmbedStandAlone/includes/noMediaWikiConfig.php 2010-05-12
19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/includes/noMediaWikiConfig.php 2010-05-12
19:50:33 UTC (rev 66289)
@@ -170,6 +170,21 @@
class MWException extends Exception {
}
+$mweSimpleProfileTester = array();
+function wfProfileIn( $name ){
+ global $mweSimpleProfileTester;
+ $mweSimpleProfileTester[ $name ] = microtime_float();
+};
+function wfProfileOut( $name ){
+ global $mweSimpleProfileTester;
+ //print "run time for $name :: " . ( microtime_float() -
$mweSimpleProfileTester[ $name ] ) . "\n";
+}
+function microtime_float()
+{
+ list($usec, $sec) = explode(" ", microtime());
+ return ((float)$usec + (float)$sec);
+}
+
/**
* Reference-counted warning suppression
*/
Modified: branches/MwEmbedStandAlone/jsScriptLoader.php
===================================================================
--- branches/MwEmbedStandAlone/jsScriptLoader.php 2010-05-12 19:49:23 UTC
(rev 66288)
+++ branches/MwEmbedStandAlone/jsScriptLoader.php 2010-05-12 19:50:33 UTC
(rev 66289)
@@ -924,12 +924,12 @@
* @param {String} $class Name of class to get inin-lineline messages
for.
* @return in-line msg javascript text or empty string if no msgs need
to be localized.
*/
- function getInlineMsgFromClass( $class ){
+ function getInlineMsgFromClass( $class ) {
$messageSet = $this->getMsgKeysFromClass( $class );
- if( $messageSet ){
+ if( $messageSet ) {
self::updateMessageValues ( $messageSet ,
$this->langCode );
return 'mw.addMessages(' . FormatJson::encode(
$messageSet ) . ');';
- }else{
+ } else {
//if could not parse return empty string:
return '';
}
@@ -980,7 +980,6 @@
if(!$langCode && $wgLang) {
$langCode = $wgLang->getCode();
}
-
// Get the msg keys for the a json array
foreach ( $messegeArray as $msgKey => $na ) {
// Language codes use dash instead of underscore
internally
Modified: branches/MwEmbedStandAlone/languages/mwEmbed.i18n.php
===================================================================
--- branches/MwEmbedStandAlone/languages/mwEmbed.i18n.php 2010-05-12
19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/languages/mwEmbed.i18n.php 2010-05-12
19:50:33 UTC (rev 66289)
@@ -1,5 +1,4 @@
<?php
-
/**
* Localization file for mwEmbed.js
*/
Property changes on: branches/MwEmbedStandAlone/libraries/jquery
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/js2/mwEmbed/jquery:51646
/branches/sqlite/js2/mwEmbed/jquery:58211-58321
Added: branches/MwEmbedStandAlone/libraries/json/json2.js
===================================================================
--- branches/MwEmbedStandAlone/libraries/json/json2.js
(rev 0)
+++ branches/MwEmbedStandAlone/libraries/json/json2.js 2010-05-12 19:50:33 UTC
(rev 66289)
@@ -0,0 +1,479 @@
+/*
+ http://www.JSON.org/json2.js
+ 2009-09-29
+
+ Public Domain.
+
+ NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+ See http://www.JSON.org/js.html
+
+ This file creates a global JSON object containing two methods: stringify
+ and parse.
+
+ JSON.stringify(value, replacer, space)
+ value any JavaScript value, usually an object or array.
+
+ replacer an optional parameter that determines how object
+ values are stringified for objects. It can be a
+ function or an array of strings.
+
+ space an optional parameter that specifies the indentation
+ of nested structures. If it is omitted, the text will
+ be packed without extra whitespace. If it is a number,
+ it will specify the number of spaces to indent at each
+ level. If it is a string (such as '\t' or ' '),
+ it contains the characters used to indent at each
level.
+
+ This method produces a JSON text from a JavaScript value.
+
+ When an object value is found, if the object contains a toJSON
+ method, its toJSON method will be called and the result will be
+ stringified. A toJSON method does not serialize: it returns the
+ value represented by the name/value pair that should be serialized,
+ or undefined if nothing should be serialized. The toJSON method
+ will be passed the key associated with the value, and this will be
+ bound to the value
+
+ For example, this would serialize Dates as ISO strings.
+
+ Date.prototype.toJSON = function (key) {
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ You can provide an optional replacer method. It will be passed the
+ key and value of each member, with this bound to the containing
+ object. The value that is returned from your method will be
+ serialized. If your method returns undefined, then the member will
+ be excluded from the serialization.
+
+ If the replacer parameter is an array of strings, then it will be
+ used to select the members to be serialized. It filters the results
+ such that only members with keys listed in the replacer array are
+ stringified.
+
+ Values that do not have JSON representations, such as undefined or
+ functions, will not be serialized. Such values in objects will be
+ dropped; in arrays they will be replaced with null. You can use
+ a replacer function to replace those with JSON values.
+ JSON.stringify(undefined) returns undefined.
+
+ The optional space parameter produces a stringification of the
+ value that is filled with line breaks and indentation to make it
+ easier to read.
+
+ If the space parameter is a non-empty string, then that string will
+ be used for indentation. If the space parameter is a number, then
+ the indentation will be that many spaces.
+
+ Example:
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}]);
+ // text is '["e",{"pluribus":"unum"}]'
+
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+ // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+ text = JSON.stringify([new Date()], function (key, value) {
+ return this[key] instanceof Date ?
+ 'Date(' + this[key] + ')' : value;
+ });
+ // text is '["Date(---current time---)"]'
+
+
+ JSON.parse(text, reviver)
+ This method parses a JSON text to produce an object or array.
+ It can throw a SyntaxError exception.
+
+ The optional reviver parameter is a function that can filter and
+ transform the results. It receives each of the keys and values,
+ and its return value is used instead of the original value.
+ If it returns what it received, then the structure is not modified.
+ If it returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. Values that look like ISO date strings will
+ // be converted to Date objects.
+
+ myData = JSON.parse(text, function (key, value) {
+ var a;
+ if (typeof value === 'string') {
+ a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+ if (a) {
+ return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3],
+a[4],
+ +a[5], +a[6]));
+ }
+ }
+ return value;
+ });
+
+ myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+ var d;
+ if (typeof value === 'string' &&
+ value.slice(0, 5) === 'Date(' &&
+ value.slice(-1) === ')') {
+ d = new Date(value.slice(5, -1));
+ if (d) {
+ return d;
+ }
+ }
+ return value;
+ });
+
+
+ This is a reference implementation. You are free to copy, modify, or
+ redistribute.
+
+ This code should be minified before deployment.
+ See http://javascript.crockford.com/jsmin.html
+
+ USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+ NOT CONTROL.
+*/
+
+/*jslint evil: true, strict: false */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+ call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+ getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+ lastIndex, length, parse, prototype, push, replace, slice, stringify,
+ test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+if (!this.JSON) {
+ this.JSON = {};
+}
+
+(function () {
+
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ if (typeof Date.prototype.toJSON !== 'function') {
+
+ Date.prototype.toJSON = function (key) {
+
+ return isFinite(this.valueOf()) ?
+ this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z' : null;
+ };
+
+ String.prototype.toJSON =
+ Number.prototype.toJSON =
+ Boolean.prototype.toJSON = function (key) {
+ return this.valueOf();
+ };
+ }
+
+ var cx =
/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ escapable =
/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ gap,
+ indent,
+ meta = { // table of character substitutions
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ rep;
+
+
+ function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+ escapable.lastIndex = 0;
+ return escapable.test(string) ?
+ '"' + string.replace(escapable, function (a) {
+ var c = meta[a];
+ return typeof c === 'string' ? c :
+ '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ }) + '"' :
+ '"' + string + '"';
+ }
+
+
+ function str(key, holder) {
+
+// Produce a string from holder[key].
+
+ var i, // The loop counter.
+ k, // The member key.
+ v, // The member value.
+ length,
+ mind = gap,
+ partial,
+ value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+ if (value && typeof value === 'object' &&
+ typeof value.toJSON === 'function') {
+ value = value.toJSON(key);
+ }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+ if (typeof rep === 'function') {
+ value = rep.call(holder, key, value);
+ }
+
+// What happens next depends on the value's type.
+
+ switch (typeof value) {
+ case 'string':
+ return quote(value);
+
+ case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+ return isFinite(value) ? String(value) : 'null';
+
+ case 'boolean':
+ case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+ return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+ case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+ if (!value) {
+ return 'null';
+ }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+ gap += indent;
+ partial = [];
+
+// Is the value an array?
+
+ if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+ length = value.length;
+ for (i = 0; i < length; i += 1) {
+ partial[i] = str(i, value) || 'null';
+ }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+ v = partial.length === 0 ? '[]' :
+ gap ? '[\n' + gap +
+ partial.join(',\n' + gap) + '\n' +
+ mind + ']' :
+ '[' + partial.join(',') + ']';
+ gap = mind;
+ return v;
+ }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+ if (rep && typeof rep === 'object') {
+ length = rep.length;
+ for (i = 0; i < length; i += 1) {
+ k = rep[i];
+ if (typeof k === 'string') {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+ for (k in value) {
+ if (Object.hasOwnProperty.call(value, k)) {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+ v = partial.length === 0 ? '{}' :
+ gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+ mind + '}' : '{' + partial.join(',') + '}';
+ gap = mind;
+ return v;
+ }
+ }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+ if (typeof JSON.stringify !== 'function') {
+ JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+ var i;
+ gap = '';
+ indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+ if (typeof space === 'number') {
+ for (i = 0; i < space; i += 1) {
+ indent += ' ';
+ }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+ } else if (typeof space === 'string') {
+ indent = space;
+ }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+ rep = replacer;
+ if (replacer && typeof replacer !== 'function' &&
+ (typeof replacer !== 'object' ||
+ typeof replacer.length !== 'number')) {
+ throw new Error('JSON.stringify');
+ }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+ return str('', {'': value});
+ };
+ }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+ if (typeof JSON.parse !== 'function') {
+ JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+ var j;
+
+ function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line
endings.
+
+ cx.lastIndex = 0;
+ if (cx.test(text)) {
+ text = text.replace(cx, function (a) {
+ return '\\u' +
+ ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ });
+ }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+ if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+ j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+ return typeof reviver === 'function' ?
+ walk({'': j}, '') : j;
+ }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+ throw new SyntaxError('JSON.parse');
+ };
+ }
+}());
Modified: branches/MwEmbedStandAlone/loader.js
===================================================================
--- branches/MwEmbedStandAlone/loader.js 2010-05-12 19:49:23 UTC (rev
66288)
+++ branches/MwEmbedStandAlone/loader.js 2010-05-12 19:50:33 UTC (rev
66289)
@@ -125,65 +125,68 @@
*/
mw.addClassFilePaths( {
"mwEmbed" : "mwEmbed.js",
- "window.jQuery" : "jquery/jquery-1.4.2.js",
+ "window.jQuery" : "libraries/jquery/jquery-1.4.2.js",
"mw.Language" : "languages/mw.Language.js",
- "$j.replaceText.js" :
"jquery/plugins/jquery.replaceText.js",
+
+ "JSON" : "libraries/json/json2.js",
+
+ "$j.replaceText.js" :
"libraries/jquery/plugins/jquery.replaceText.js",
- "$j.fn.menu" :
"jquery/plugins/jquery.menu/jquery.menu.js",
- "mw.style.jquerymenu" : "jquery/plugins/jquery.menu/jquery.menu.css",
+ "$j.fn.menu" :
"libraries/jquery/plugins/jquery.menu/jquery.menu.js",
+ "mw.style.jquerymenu" :
"libraries/jquery/plugins/jquery.menu/jquery.menu.css",
- "$j.fn.pngFix" : "jquery/plugins/jquery.pngFix.js",
- "$j.fn.autocomplete" : "jquery/plugins/jquery.autocomplete.js",
- "mw.style.autocomplete" : "jquery/plugins/jquery.autocomplete.css",
+ "$j.fn.pngFix" :
"libraries/jquery/plugins/jquery.pngFix.js",
+ "$j.fn.autocomplete" :
"libraries/jquery/plugins/jquery.autocomplete.js",
+ "mw.style.autocomplete" :
"libraries/jquery/plugins/jquery.autocomplete.css",
- "$j.fn.hoverIntent" :
"jquery/plugins/jquery.hoverIntent.js",
- "$j.fn.datePicker" : "jquery/plugins/jquery.datePicker.js",
- "$j.ui" :
"jquery/jquery.ui/ui/ui.core.js",
+ "$j.fn.hoverIntent" :
"libraries/jquery/plugins/jquery.hoverIntent.js",
+ "$j.fn.datePicker" :
"libraries/jquery/plugins/jquery.datePicker.js",
+ "$j.ui" :
"libraries/jquery/jquery.ui/ui/ui.core.js",
- "mw.style.jqueryUiRedmond" :
"jquery/jquery.ui/themes/redmond/jquery-ui-1.7.1.custom.css",
- "mw.style.jqueryUiSmoothness" :
"jquery/jquery.ui/themes/smoothness/jquery-ui-1.7.1.custom.css",
+ "mw.style.jqueryUiRedmond" :
"libraries/jquery/jquery.ui/themes/redmond/jquery-ui-1.7.1.custom.css",
+ "mw.style.jqueryUiSmoothness" :
"libraries/jquery/jquery.ui/themes/smoothness/jquery-ui-1.7.1.custom.css",
"mw.style.mwCommon" : "skins/common/common.css",
"mw.testLang" : "tests/testLang.js",
- "$j.cookie" :
"jquery/plugins/jquery.cookie.js",
- "$j.contextMenu" :
"jquery/plugins/jquery.contextMenu.js",
- "$j.fn.suggestions" :
"jquery/plugins/jquery.suggestions.js",
- "$j.fn.textSelection" : "jquery/plugins/jquery.textSelection.js",
- "$j.browserTest" :
"jquery/plugins/jquery.browserTest.js",
- "$j.fn.jWizard" : "jquery/plugins/jquery.jWizard.js",
+ "$j.cookie" :
"libraries/jquery/plugins/jquery.cookie.js",
+ "$j.contextMenu" :
"libraries/jquery/plugins/jquery.contextMenu.js",
+ "$j.fn.suggestions" :
"libraries/jquery/plugins/jquery.suggestions.js",
+ "$j.fn.textSelection" :
"libraries/jquery/plugins/jquery.textSelection.js",
+ "$j.browserTest" :
"libraries/jquery/plugins/jquery.browserTest.js",
+ "$j.fn.jWizard" :
"libraries/jquery/plugins/jquery.jWizard.js",
"$j.fn.tipsy" : "jquery/plugins/jquery.tipsy.js",
"mw.style.tipsy" : "jquery/plugins/jquery.tipsy.css",
- "$j.effects.blind" :
"jquery/jquery.ui/ui/effects.blind.js",
- "$j.effects.drop" : "jquery/jquery.ui/ui/effects.drop.js",
- "$j.effects.pulsate" : "jquery/jquery.ui/ui/effects.pulsate.js",
- "$j.effects.transfer" : "jquery/jquery.ui/ui/effects.transfer.js",
- "$j.ui.droppable" : "jquery/jquery.ui/ui/ui.droppable.js",
- "$j.ui.slider" : "jquery/jquery.ui/ui/ui.slider.js",
- "$j.effects.bounce" :
"jquery/jquery.ui/ui/effects.bounce.js",
- "$j.effects.explode" : "jquery/jquery.ui/ui/effects.explode.js",
- "$j.effects.scale" :
"jquery/jquery.ui/ui/effects.scale.js",
- "$j.ui.datepicker" :
"jquery/jquery.ui/ui/ui.datepicker.js",
- "$j.ui.progressbar" :
"jquery/jquery.ui/ui/ui.progressbar.js",
- "$j.ui.sortable" : "jquery/jquery.ui/ui/ui.sortable.js",
- "$j.effects.clip" : "jquery/jquery.ui/ui/effects.clip.js",
- "$j.effects.fold" : "jquery/jquery.ui/ui/effects.fold.js",
- "$j.effects.shake" :
"jquery/jquery.ui/ui/effects.shake.js",
- "$j.ui.dialog" : "jquery/jquery.ui/ui/ui.dialog.js",
- "$j.ui.resizable" : "jquery/jquery.ui/ui/ui.resizable.js",
- "$j.ui.tabs" : "jquery/jquery.ui/ui/ui.tabs.js",
- "$j.effects.core" : "jquery/jquery.ui/ui/effects.core.js",
- "$j.effects.highlight" : "jquery/jquery.ui/ui/effects.highlight.js",
- "$j.effects.slide" :
"jquery/jquery.ui/ui/effects.slide.js",
- "$j.ui.accordion" : "jquery/jquery.ui/ui/ui.accordion.js",
- "$j.ui.draggable" : "jquery/jquery.ui/ui/ui.draggable.js",
- "$j.ui.selectable" :
"jquery/jquery.ui/ui/ui.selectable.js"
+ "$j.effects.blind" :
"libraries/jquery/jquery.ui/ui/effects.blind.js",
+ "$j.effects.drop" :
"libraries/jquery/jquery.ui/ui/effects.drop.js",
+ "$j.effects.pulsate" :
"libraries/jquery/jquery.ui/ui/effects.pulsate.js",
+ "$j.effects.transfer" :
"libraries/jquery/jquery.ui/ui/effects.transfer.js",
+ "$j.ui.droppable" :
"libraries/jquery/jquery.ui/ui/ui.droppable.js",
+ "$j.ui.slider" :
"libraries/jquery/jquery.ui/ui/ui.slider.js",
+ "$j.effects.bounce" :
"libraries/jquery/jquery.ui/ui/effects.bounce.js",
+ "$j.effects.explode" :
"libraries/jquery/jquery.ui/ui/effects.explode.js",
+ "$j.effects.scale" :
"libraries/jquery/jquery.ui/ui/effects.scale.js",
+ "$j.ui.datepicker" :
"libraries/jquery/jquery.ui/ui/ui.datepicker.js",
+ "$j.ui.progressbar" :
"libraries/jquery/jquery.ui/ui/ui.progressbar.js",
+ "$j.ui.sortable" :
"libraries/jquery/jquery.ui/ui/ui.sortable.js",
+ "$j.effects.clip" :
"libraries/jquery/jquery.ui/ui/effects.clip.js",
+ "$j.effects.fold" :
"libraries/jquery/jquery.ui/ui/effects.fold.js",
+ "$j.effects.shake" :
"libraries/jquery/jquery.ui/ui/effects.shake.js",
+ "$j.ui.dialog" :
"libraries/jquery/jquery.ui/ui/ui.dialog.js",
+ "$j.ui.resizable" :
"libraries/jquery/jquery.ui/ui/ui.resizable.js",
+ "$j.ui.tabs" :
"libraries/jquery/jquery.ui/ui/ui.tabs.js",
+ "$j.effects.core" :
"libraries/jquery/jquery.ui/ui/effects.core.js",
+ "$j.effects.highlight" :
"libraries/jquery/jquery.ui/ui/effects.highlight.js",
+ "$j.effects.slide" :
"libraries/jquery/jquery.ui/ui/effects.slide.js",
+ "$j.ui.accordion" :
"libraries/jquery/jquery.ui/ui/ui.accordion.js",
+ "$j.ui.draggable" :
"libraries/jquery/jquery.ui/ui/ui.draggable.js",
+ "$j.ui.selectable" :
"libraries/jquery/jquery.ui/ui/ui.selectable.js"
} );
-// For now just the special case of $j.ui
+// Add a special css dependency for $j.ui
mw.addClassStyleDependency( {
'$j.ui' : ( 'mw.style.' + mw.getConfig( 'jQueryUISkin' ) )
} );
Modified: branches/MwEmbedStandAlone/modules/ApiProxy/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/ApiProxy/loader.js 2010-05-12
19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/modules/ApiProxy/loader.js 2010-05-12
19:50:33 UTC (rev 66289)
@@ -2,7 +2,6 @@
mw.addClassFilePaths( {
"mw.ApiProxy" : "mw.ApiProxy.js",
- "JSON" : "json2.js"
} );
mw.addModuleLoader( 'ApiProxy', function( callback ) {
Modified: branches/MwEmbedStandAlone/skins/README
===================================================================
--- branches/MwEmbedStandAlone/skins/README 2010-05-12 19:49:23 UTC (rev
66288)
+++ branches/MwEmbedStandAlone/skins/README 2010-05-12 19:50:33 UTC (rev
66289)
@@ -1 +1 @@
-The contents of this folder will be moved into /css per module. All modules
should defer to jquery.ui for themeing with customization happening out
\ No newline at end of file
+Most skin css should be stored per module
Modified: branches/MwEmbedStandAlone/tests/Add_Media_Wizard.html
===================================================================
--- branches/MwEmbedStandAlone/tests/Add_Media_Wizard.html 2010-05-12
19:49:23 UTC (rev 66288)
+++ branches/MwEmbedStandAlone/tests/Add_Media_Wizard.html 2010-05-12
19:50:33 UTC (rev 66289)
@@ -11,8 +11,8 @@
border:medium none;
}
</style>
-
- <script type="text/javascript" src="../mwEmbed.js?debug=true"></script>
+ <!-- <script
src="../jsScriptLoader.php?class=window.jQuery,mwEmbed&debug=true"></script> -->
+ <script type="text/javascript" src="../mwEmbed.js?debug=true"></script>
<script type="text/javascript">
mw.ready( function(){
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
