From bb906dea11957fcd79b9d36872222987a7b4b0ab Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Sat, 16 Jan 2010 17:42:04 +0000
Subject: [PATCH] * added inline section edit to wikiEditor ( using js2 /
 mwEmbed conventions ) ** added "loaders" to "WikiEditor" and
 UsabilityInitiative core js ** added >= 1.17 script include calls * some
 general mwEmbed loader fixes (around loadDone ) * fixed $j.cookie jquery
 wrapping * more jsClassLoader clean up. * unified wgJSAutoloadLocalClasses
 var

---
 includes/DefaultSettings.php | 12 ++++++++++--
 js2/js2stopgap.js            |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2fee266ed..91576e2b1c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3083,9 +3083,9 @@ $wgBrowserBlackList = array(
 /**
  * Fake out the timezone that the server thinks it's in. This will be used for
  * date display and not for what's stored in the DB. Leave to null to retain
- * your server's OS-based timezone value. 
+ * your server's OS-based timezone value.
  *
- * This variable is currently used only for signature formatting and for local 
+ * This variable is currently used only for signature formatting and for local
  * time/date parser variables ({{LOCALTIME}} etc.)
  *
  * Timezones can be translated by editing MediaWiki messages of type
@@ -4311,3 +4311,11 @@ $wgUploadMaintenance = false;
  * Use old names for change_tags indices.
  */
 $wgOldChangeTagsIndex = false;
+
+/**
+ * Set of loader.js files to setup dynamic loading of javascript libraries using mwEmbed
+ *
+ * Extensions can add mwEmbed modules via adding paths to their loader.js to
+ * $wgExtensionJavascriptLoader[] = path/to/loader.js
+ */
+$wgExtensionJavascriptLoader = array();
\ No newline at end of file
diff --git a/js2/js2stopgap.js b/js2/js2stopgap.js
index 6d7626da35..b61567b75e 100644
--- a/js2/js2stopgap.js
+++ b/js2/js2stopgap.js
@@ -4405,6 +4405,9 @@ if( typeof mw == 'undefined' || !mw ){
    // Define a dummy mw.load function:
    mw.load = function( deps, callback ) { callback(); };
    
+   // Deinfe a dummy mw.loadDone function: 
+   mw.loadDone = function( className ) { };
+   
    // Creates global message object if not already in existence
 	if ( !gMsg ) var gMsg = {};
    
-- 
2.20.1