renamed linkwiz object

3 files changed, 92 insertions, 74 deletions

diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index 58efc03b9..6c851d5e2 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -13,6 +13,24 @@ var ajax_quicksearch = {
     onCompletion: DEPRECATED_WRAP(dw_qsearch.onCompletion, dw_qsearch)
 };
 
+var linkwiz = {
+    init: DEPRECATED_WRAP(dw_linkwiz.init, dw_linkwiz),
+    onEntry: DEPRECATED_WRAP(dw_linkwiz.onEntry, dw_linkwiz),
+    getResult: DEPRECATED_WRAP(dw_linkwiz.getResult, dw_linkwiz),
+    select: DEPRECATED_WRAP(dw_linkwiz.select, dw_linkwiz),
+    deselect: DEPRECATED_WRAP(dw_linkwiz.deselect, dw_linkwiz),
+    onResultClick: DEPRECATED_WRAP(dw_linkwiz.onResultClick, dw_linkwiz),
+    resultClick: DEPRECATED_WRAP(dw_linkwiz.resultClick, dw_linkwiz),
+    insertLink: DEPRECATED_WRAP(dw_linkwiz.insertLink, dw_linkwiz),
+    autocomplete: DEPRECATED_WRAP(dw_linkwiz.autocomplete, dw_linkwiz),
+    autocomplete_exec: DEPRECATED_WRAP(dw_linkwiz.autocomplete_exec, dw_linkwiz),
+    clear: DEPRECATED_WRAP(dw_linkwiz.clear, dw_linkwiz),
+    show: DEPRECATED_WRAP(dw_linkwiz.show, dw_linkwiz),
+    hide: DEPRECATED_WRAP(dw_linkwiz.hide, dw_linkwiz),
+    toggle: DEPRECATED_WRAP(dw_linkwiz.toggle, dw_linkwiz)
+};
+
+
 function findPosX(object){
     DEPRECATED('Use jQuery.position() instead');
     return jQuery(object).position().left;
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 9ad72626d..14fa33795 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -8,7 +8,7 @@
  * @author Andreas Gohr <gohr@cosmocode.de>
  * @author Pierre Spring <pierre.spring@caillou.ch>
  */
-var linkwiz = {
+var dw_linkwiz = {
     $wiz: null,
     entry: null,
     result: null,
@@ -18,7 +18,7 @@ var linkwiz = {
     selection: null,
 
     /**
-     * Initialize the linkwizard by creating the needed HTML
+     * Initialize the dw_linkwizard by creating the needed HTML
      * and attaching the eventhandlers
      */
     init: function($editor){
@@ -28,7 +28,7 @@ var linkwiz = {
         pos.right += 80;
 
         // create HTML Structure
-        linkwiz.$wiz = jQuery(document.createElement('div'))
+        dw_linkwiz.$wiz = jQuery(document.createElement('div'))
                .attr('id','link__wiz')
                .css({
                     'position':    'absolute',
@@ -46,17 +46,17 @@ var linkwiz = {
                     )
                .addClass('picker');
 
-        $editor[0].form.parentNode.appendChild(linkwiz.$wiz[0]);
-        linkwiz.textArea = $editor[0];
-        linkwiz.result = jQuery('#link__wiz_result')[0];
-        linkwiz.entry = jQuery('#link__wiz_entry')[0];
+        $editor[0].form.parentNode.appendChild(dw_linkwiz.$wiz[0]);
+        dw_linkwiz.textArea = $editor[0];
+        dw_linkwiz.result = jQuery('#link__wiz_result')[0];
+        dw_linkwiz.entry = jQuery('#link__wiz_entry')[0];
 
         // attach event handlers
-        jQuery('#link__wiz_close').click(linkwiz.hide);
-        jQuery(linkwiz.entry).keyup(linkwiz.onEntry);
-        jQuery(linkwiz.result).click(linkwiz.onResultClick);
+        jQuery('#link__wiz_close').click(dw_linkwiz.hide);
+        jQuery(dw_linkwiz.entry).keyup(dw_linkwiz.onEntry);
+        jQuery(dw_linkwiz.result).click(dw_linkwiz.onResultClick);
 
-        linkwiz.$wiz.draggable({handle: '#link__wiz_header'});
+        dw_linkwiz.$wiz.draggable({handle: '#link__wiz_header'});
     },
 
     /**
@@ -67,39 +67,39 @@ var linkwiz = {
             return true; //ignore
         }
         if(e.keyCode == 27){
-            linkwiz.hide();
+            dw_linkwiz.hide();
             e.preventDefault();
             e.stopPropagation();
             return false;
         }
         if(e.keyCode == 38){ //Up
-            linkwiz.select(linkwiz.selected -1);
+            dw_linkwiz.select(dw_linkwiz.selected -1);
             e.preventDefault();
             e.stopPropagation();
             return false;
         }
         if(e.keyCode == 40){ //Down
-            linkwiz.select(linkwiz.selected +1);
+            dw_linkwiz.select(dw_linkwiz.selected +1);
             e.preventDefault();
             e.stopPropagation();
             return false;
         }
         if(e.keyCode == 13){ //Enter
-            if(linkwiz.selected > -1){
-                var obj = linkwiz.getResult(linkwiz.selected);
+            if(dw_linkwiz.selected > -1){
+                var obj = dw_linkwiz.getResult(dw_linkwiz.selected);
                 if(obj){
                     var a = jQuery(obj).find('a')[0];
-                    linkwiz.resultClick(a);
+                    dw_linkwiz.resultClick(a);
                 }
-            }else if(linkwiz.entry.value){
-                linkwiz.insertLink(linkwiz.entry.value);
+            }else if(dw_linkwiz.entry.value){
+                dw_linkwiz.insertLink(dw_linkwiz.entry.value);
             }
 
             e.preventDefault();
             e.stopPropagation();
             return false;
         }
-        linkwiz.autocomplete();
+        dw_linkwiz.autocomplete();
     },
 
     /**
@@ -109,7 +109,7 @@ var linkwiz = {
      * @returns DOMObject or null
      */
     getResult: function(num){
-        var childs = jQuery(linkwiz.result).find('div');
+        var childs = jQuery(dw_linkwiz.result).find('div');
         var obj = childs[num];
         if(obj){
             return obj;
@@ -123,29 +123,29 @@ var linkwiz = {
      */
     select: function(num){
         if(num < 0){
-            linkwiz.deselect();
+            dw_linkwiz.deselect();
             return;
         }
 
-        var obj = linkwiz.getResult(num);
+        var obj = dw_linkwiz.getResult(num);
         if(obj){
-            linkwiz.deselect();
+            dw_linkwiz.deselect();
             obj.className += ' selected';
 
             // make sure the item is viewable in the scroll view
             // FIXME check IE compatibility
-            if(obj.offsetTop > linkwiz.result.scrollTop + linkwiz.result.clientHeight){
-                linkwiz.result.scrollTop += obj.clientHeight;
-            }else if(obj.offsetTop - linkwiz.result.clientHeight < linkwiz.result.scrollTop){ // this works but isn't quite right, fixes welcome
-                linkwiz.result.scrollTop -= obj.clientHeight;
+            if(obj.offsetTop > dw_linkwiz.result.scrollTop + dw_linkwiz.result.clientHeight){
+                dw_linkwiz.result.scrollTop += obj.clientHeight;
+            }else if(obj.offsetTop - dw_linkwiz.result.clientHeight < dw_linkwiz.result.scrollTop){ // this works but isn't quite right, fixes welcome
+                dw_linkwiz.result.scrollTop -= obj.clientHeight;
             }
             // now recheck - if still not in view, the user used the mouse to scroll
-            if( (obj.offsetTop > linkwiz.result.scrollTop + linkwiz.result.clientHeight) ||
-                (obj.offsetTop < linkwiz.result.scrollTop) ){
+            if( (obj.offsetTop > dw_linkwiz.result.scrollTop + dw_linkwiz.result.clientHeight) ||
+                (obj.offsetTop < dw_linkwiz.result.scrollTop) ){
                 obj.scrollIntoView();
             }
 
-            linkwiz.selected = num;
+            dw_linkwiz.selected = num;
         }
     },
 
@@ -153,13 +153,13 @@ var linkwiz = {
      * deselect a result if any is selected
      */
     deselect: function(){
-        if(linkwiz.selected > -1){
-            var obj = linkwiz.getResult(linkwiz.selected);
+        if(dw_linkwiz.selected > -1){
+            var obj = dw_linkwiz.getResult(dw_linkwiz.selected);
             if(obj){
                 obj.className = obj.className.replace(/ ?selected/,'');
             }
         }
-        linkwiz.selected = -1;
+        dw_linkwiz.selected = -1;
     },
 
     /**
@@ -170,7 +170,7 @@ var linkwiz = {
         if(e.target.tagName != 'A') return;
         e.stopPropagation();
         e.preventDefault();
-        linkwiz.resultClick(e.target);
+        dw_linkwiz.resultClick(e.target);
         return false;
     },
 
@@ -180,14 +180,14 @@ var linkwiz = {
     resultClick: function(a){
         var id = a.title;
         if(id == '' || id.substr(id.length-1) == ':'){
-            linkwiz.entry.value = id;
-            linkwiz.autocomplete_exec();
+            dw_linkwiz.entry.value = id;
+            dw_linkwiz.autocomplete_exec();
         }else{
-            linkwiz.entry.value = id;
+            dw_linkwiz.entry.value = id;
             if(a.nextSibling && a.nextSibling.tagName == 'SPAN'){
-                linkwiz.insertLink(a.nextSibling.innerHTML);
+                dw_linkwiz.insertLink(a.nextSibling.innerHTML);
             }else{
-                linkwiz.insertLink('');
+                dw_linkwiz.insertLink('');
             }
         }
     },
@@ -199,10 +199,10 @@ var linkwiz = {
      * as link title instead
      */
     insertLink: function(title){
-        if(!linkwiz.entry.value) return;
+        if(!dw_linkwiz.entry.value) return;
 
-        var sel = getSelection(linkwiz.textArea);
-        if(sel.start == 0 && sel.end == 0) sel = linkwiz.selection;
+        var sel = getSelection(dw_linkwiz.textArea);
+        if(sel.start == 0 && sel.end == 0) sel = dw_linkwiz.selection;
 
         var stxt = sel.getText();
 
@@ -215,22 +215,22 @@ var linkwiz = {
         if(!stxt && !DOKU_UHC) stxt=title;
 
         // prepend colon inside namespaces for non namespace pages
-        if(linkwiz.textArea.form['id'].value.indexOf(':') != -1 &&
-           linkwiz.entry.value.indexOf(':') == -1){
-            linkwiz.entry.value = ':'+linkwiz.entry.value;
+        if(dw_linkwiz.textArea.form['id'].value.indexOf(':') != -1 &&
+           dw_linkwiz.entry.value.indexOf(':') == -1){
+            dw_linkwiz.entry.value = ':'+dw_linkwiz.entry.value;
         }
 
-        var link = '[['+linkwiz.entry.value+'|';
+        var link = '[['+dw_linkwiz.entry.value+'|';
         if(stxt) link += stxt;
         link += ']]';
 
-        var so = linkwiz.entry.value.length+3;
+        var so = dw_linkwiz.entry.value.length+3;
         var eo = 2;
 
         pasteText(sel,link,{startofs: so, endofs: eo});
-        linkwiz.hide();
+        dw_linkwiz.hide();
         // reset the entry to the parent namespace and remove : at the beginning
-        linkwiz.entry.value = linkwiz.entry.value.replace(/(^:)?[^:]*$/, '');
+        dw_linkwiz.entry.value = dw_linkwiz.entry.value.replace(/(^:)?[^:]*$/, '');
     },
 
     /**
@@ -239,20 +239,20 @@ var linkwiz = {
      * Calls autocomplete_exec when the timer runs out
      */
     autocomplete: function(){
-        if(linkwiz.timer !== null){
-            window.clearTimeout(linkwiz.timer);
-            linkwiz.timer = null;
+        if(dw_linkwiz.timer !== null){
+            window.clearTimeout(dw_linkwiz.timer);
+            dw_linkwiz.timer = null;
         }
 
-        linkwiz.timer = window.setTimeout(linkwiz.autocomplete_exec,350);
+        dw_linkwiz.timer = window.setTimeout(dw_linkwiz.autocomplete_exec,350);
     },
 
     /**
      * Executes the AJAX call for the page/namespace lookup
      */
     autocomplete_exec: function(){
-        linkwiz.deselect();
-        linkwiz.result.innerHTML = '<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="" width="16" height="16" />';
+        dw_linkwiz.deselect();
+        dw_linkwiz.result.innerHTML = '<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="" width="16" height="16" />';
 
         // because we need to use POST, we
         // can not use the .load() function.
@@ -260,10 +260,10 @@ var linkwiz = {
             DOKU_BASE + 'lib/exe/ajax.php',
             {
                 call: 'linkwiz',
-                q: linkwiz.entry.value
+                q: dw_linkwiz.entry.value
             },
             function (data) {
-                linkwiz.result.innerHTML = data;
+                dw_linkwiz.result.innerHTML = data;
             },
             'html'
         );
@@ -274,38 +274,38 @@ var linkwiz = {
      * @fixme localize
      */
     clear: function(){
-        linkwiz.result.innerHTML = 'Search for a matching page name above, or browse through the pages on the right';
-        linkwiz.entry.value = '';
+        dw_linkwiz.result.innerHTML = 'Search for a matching page name above, or browse through the pages on the right';
+        dw_linkwiz.entry.value = '';
     },
 
     /**
-     * Show the linkwizard
+     * Show the dw_linkwizard
      */
     show: function(){
-        linkwiz.selection  = getSelection(linkwiz.textArea);
-        linkwiz.$wiz.css('marginLeft', '0');
-        linkwiz.$wiz.css('marginTop', '0');
-        linkwiz.entry.focus();
-        linkwiz.autocomplete();
+        dw_linkwiz.selection  = getSelection(dw_linkwiz.textArea);
+        dw_linkwiz.$wiz.css('marginLeft', '0');
+        dw_linkwiz.$wiz.css('marginTop', '0');
+        dw_linkwiz.entry.focus();
+        dw_linkwiz.autocomplete();
     },
 
     /**
      * Hide the link wizard
      */
     hide: function(){
-        linkwiz.$wiz.css('marginLeft', '-10000px');
-        linkwiz.$wiz.css('marginTop', '-10000px');
-        linkwiz.textArea.focus();
+        dw_linkwiz.$wiz.css('marginLeft', '-10000px');
+        dw_linkwiz.$wiz.css('marginTop', '-10000px');
+        dw_linkwiz.textArea.focus();
     },
 
     /**
      * Toggle the link wizard
      */
     toggle: function(){
-        if(linkwiz.$wiz.css('marginLeft') == '-10000px'){
-            linkwiz.show();
+        if(dw_linkwiz.$wiz.css('marginLeft') == '-10000px'){
+            dw_linkwiz.show();
         }else{
-            linkwiz.hide();
+            dw_linkwiz.hide();
         }
     }
 
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index fc95340f5..2306ef5db 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -226,9 +226,9 @@ function addBtnActionPicker(btn, props, edid) {
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 function addBtnActionLinkwiz(btn, props, edid) {
-    linkwiz.init(jQuery('#'+edid));
+    dw_linkwiz.init(jQuery('#'+edid));
     jQuery(btn).click(function(){
-        linkwiz.toggle();
+        dw_linkwiz.toggle();
         return false;
     });
     return true;