FS#1134 removed inline javascript from mediamanager

darcs-hash:20081012151319-23886-cf6100556d4bdfd1090d1c6be0023aa3dd6840cc.gz

2 files changed, 20 insertions, 5 deletions

diff --git a/inc/media.php b/inc/media.php
index ac0629b3f..243772ad5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -456,12 +456,8 @@ function media_fileactions($item,$auth){
 
     // delete button
     if($auth >= AUTH_DELETE){
-        $ask  = addslashes($lang['del_confirm']).'\\n';
-        $ask .= addslashes($item['id']);
-
         echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
-             '&amp;sectok='.getSecurityToken().'" '.
-             'onclick="return confirm(\''.$ask.'\')">'.
+             '&amp;sectok='.getSecurityToken().'" class="btn_media_delete" title="'.$item['id'].'">'.
              '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
              'title="'.$lang['btn_delete'].'" class="btn" /></a>';
     }
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 7d0c78730..ffcd40d46 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -59,6 +59,23 @@ media = {
         addEvent(file,'change',media.suggest);
     },
 
+	/**
+	 * Attache deletion confirmation dialog to the delete buttons.
+	 *
+	 * Michael Klier <chi@chimeric.de>
+	 */
+	confirmattach: function(obj){
+		if(!obj) return;
+
+		items = getElementsByClass('btn_media_delete',obj,'a'); 
+		for(var i=0; i<items.length; i++){
+			elem = items[i];
+			addEvent(elem,'click',function(){
+				return confirm(reallyDel + "\n" + elem.title);
+			});
+		}
+	},
+
     /**
      * Creates checkboxes for additional options
      *
@@ -208,6 +225,7 @@ media = {
         ajax.elementObj = content;
         ajax.afterCompletion = function(){
             media.selectorattach(content);
+			media.confirmattach(content);
             media.updatehide();
             media.initFlashUpload();
         };
@@ -291,6 +309,7 @@ media = {
 addInitEvent(function(){
     media.treeattach($('media__tree'));
     media.selectorattach($('media__content'));
+	media.confirmattach($('media__content'));
     media.attachoptions($('media__opts'));
     media.initFlashUpload();
 });