Merge remote-tracking branch 'upstream/master' into media-revisions

1 files changed, 33 insertions, 0 deletions

diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index 2cc1246f9..20e475190 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -1,3 +1,34 @@
+// if jQuery was loaded, let's make it noConflict here.
+if ('function' === typeof jQuery && 'function' === typeof jQuery.noConflict) {
+    jQuery.noConflict();
+}
+
+/**
+ * Mark a JavaScript function as deprecated
+ *
+ * This will print a warning to the JavaScript console (if available) in
+ * Firebug and Chrome and a stack trace (if available) to easily locate the
+ * problematic function call.
+ *
+ * @param msg optional message to print
+ */
+function DEPRECATED(msg){
+    if(!console) return;
+    if(!arguments.callee) return;
+
+    var func = arguments.callee.caller.name;
+    var line = 'DEPRECATED function call '+func+'(). '+msg;
+
+    if(console.warn){
+        console.warn(line);
+    }else{
+        console.log(line);
+    }
+
+    if(console.trace) console.trace();
+}
+
+
 /**
  * Some of these scripts were taken from wikipedia.org and were modified for DokuWiki
  */
@@ -25,6 +56,8 @@ if (clientPC.indexOf('opera')!=-1) {
  * @link http://prototype.conio.net/
  */
 function $() {
+  DEPRECATED('Please use the JQuery() function instead.');
+
   var elements = new Array();
 
   for (var i = 0; i < arguments.length; i++) {