From 2f87bdf913a945fbc97abd171261a433639b125a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 16 Dec 2009 21:48:52 +0100
Subject: renamed media manager JS object FS#1813

Ignore-this: 7ded514e72e46ca3af5e22f7043dbd8b

"media" seems to be a reserved object in recent JavaScript DOM scripting
standards. Most recent Chrome builds will choke on our scripts overwriting
that name.

darcs-hash:20091216204852-7ad00-aab1927c81e2064ac763db77323085f977f38ce3.gz
---
 lib/scripts/media.js | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index cbacfa2a1..3e4213f19 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -3,7 +3,7 @@
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-var media = {
+var media_manager = {
     keepopen: false,
     hide: false,
 
@@ -22,12 +22,12 @@ var media = {
             // attach action to make the +/- clickable
             var clicky = elem.getElementsByTagName('img')[0];
             clicky.style.cursor = 'pointer';
-            addEvent(clicky,'click',function(event){ return media.toggle(event,this); });
+            addEvent(clicky,'click',function(event){ return media_manager.toggle(event,this); });
 
             // attach action load folder list via AJAX
             var link = elem.getElementsByTagName('a')[0];
             link.style.cursor = 'pointer';
-            addEvent(link,'click',function(event){ return media.list(event,this); });
+            addEvent(link,'click',function(event){ return media_manager.list(event,this); });
         }
     },
 
@@ -44,7 +44,7 @@ var media = {
         for(var i=0; i<items.length; i++){
             var elem = items[i];
             elem.style.cursor = 'pointer';
-            addEvent(elem,'click',function(event){ return media.select(event,this); });
+            addEvent(elem,'click',function(event){ return media_manager.select(event,this); });
         }
 
         // hide syntax example
@@ -56,7 +56,7 @@ var media = {
 
         var file = $('upload__file');
         if(!file) return;
-        addEvent(file,'change',media.suggest);
+        addEvent(file,'change',media_manager.suggest);
     },
 
     /**
@@ -102,9 +102,9 @@ var media = {
             if(DokuCookie.getValue('keepopen')){
                 kobox.checked  = true;
                 kobox.defaultChecked = true; //IE wants this
-                media.keepopen = true;
+                media_manager.keepopen = true;
             }
-            addEvent(kobox,'click',function(event){ return media.togglekeepopen(event,this); });
+            addEvent(kobox,'click',function(event){ return media_manager.togglekeepopen(event,this); });
 
             var kolbl  = document.createElement('label');
             kolbl.htmlFor   = 'media__keepopen';
@@ -124,9 +124,9 @@ var media = {
         if(DokuCookie.getValue('hide')){
             hdbox.checked = true;
             hdbox.defaultChecked = true; //IE wants this
-            media.hide    = true;
+            media_manager.hide    = true;
         }
-        addEvent(hdbox,'click',function(event){ return media.togglehide(event,this); });
+        addEvent(hdbox,'click',function(event){ return media_manager.togglehide(event,this); });
 
         var hdlbl  = document.createElement('label');
         hdlbl.htmlFor   = 'media__hide';
@@ -137,7 +137,7 @@ var media = {
         obj.appendChild(hdbox);
         obj.appendChild(hdlbl);
         obj.appendChild(hdbr);
-        media.updatehide();
+        media_manager.updatehide();
     },
 
     /**
@@ -159,9 +159,9 @@ var media = {
 
         ajax.elementObj = content;
         ajax.afterCompletion = function(){
-            media.selectorattach(content);
-            media.confirmattach(content);
-            media.updatehide();
+            media_manager.selectorattach(content);
+            media_manager.confirmattach(content);
+            media_manager.updatehide();
         };
         ajax.runAJAX(link.search.substr(1)+'&call=mediasearchlist');
         return false;
@@ -175,10 +175,10 @@ var media = {
     togglekeepopen: function(event,cb){
         if(cb.checked){
             DokuCookie.setValue('keepopen',1);
-            media.keepopen = true;
+            media_manager.keepopen = true;
         }else{
             DokuCookie.setValue('keepopen','');
-            media.keepopen = false;
+            media_manager.keepopen = false;
         }
     },
 
@@ -190,12 +190,12 @@ var media = {
     togglehide: function(event,cb){
         if(cb.checked){
             DokuCookie.setValue('hide',1);
-            media.hide = true;
+            media_manager.hide = true;
         }else{
             DokuCookie.setValue('hide','');
-            media.hide = false;
+            media_manager.hide = false;
         }
-        media.updatehide();
+        media_manager.updatehide();
     },
 
     /**
@@ -209,7 +209,7 @@ var media = {
         if(!obj) return;
         var details = getElementsByClass('detail',obj,'div');
         for(var i=0; i<details.length; i++){
-            if(media.hide){
+            if(media_manager.hide){
                 details[i].style.display = 'none';
             }else{
                 details[i].style.display = '';
@@ -237,7 +237,7 @@ var media = {
         }
         opener.insertTags('wiki__text','{{'+id+'|','}}','');
 
-        if(!media.keepopen) window.close();
+        if(!media_manager.keepopen) window.close();
         opener.focus();
         return false;
     },
@@ -261,10 +261,10 @@ var media = {
 
         ajax.elementObj = content;
         ajax.afterCompletion = function(){
-            media.selectorattach(content);
-            media.confirmattach(content);
-            media.updatehide();
-            media.initFlashUpload();
+            media_manager.selectorattach(content);
+            media_manager.confirmattach(content);
+            media_manager.updatehide();
+            media_manager.initFlashUpload();
         };
         ajax.runAJAX(link.search.substr(1)+'&call=medialist');
         return false;
@@ -301,7 +301,7 @@ var media = {
         //fixme add classname here
         listitem.appendChild(ul);
         ajax.elementObj = ul;
-        ajax.afterCompletion = function(){ media.treeattach(ul); };
+        ajax.afterCompletion = function(){ media_manager.treeattach(ul); };
         ajax.runAJAX(link.search.substr(1)+'&call=medians');
         clicky.src = DOKU_BASE+'lib/images/minus.gif';
         return false;
@@ -344,9 +344,9 @@ var media = {
 };
 
 addInitEvent(function(){
-    media.treeattach($('media__tree'));
-    media.selectorattach($('media__content'));
-    media.confirmattach($('media__content'));
-    media.attachoptions($('media__opts'));
-    media.initFlashUpload();
+    media_manager.treeattach($('media__tree'));
+    media_manager.selectorattach($('media__content'));
+    media_manager.confirmattach($('media__content'));
+    media_manager.attachoptions($('media__opts'));
+    media_manager.initFlashUpload();
 });
-- 
cgit v1.2.3