From ebb29737d32bc331541f78a1a47f33ba33919938 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 13 Nov 2010 13:59:17 +0100 Subject: fixed mediamanager options + ie6 fix (FS#2074) --- lib/scripts/media.js | 123 +++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 59 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 8eb19ce6b..5b9372b68 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -206,7 +206,7 @@ var media_manager = { media_manager.id = id; if(!opener){ // if we don't run in popup display example - var ex = $('ex_'+id.replace(/:/g,'_')); + var ex = $('ex'+id.replace(/:/g,'_')); if(ex.style.display == ''){ ex.style.display = 'none'; } else { @@ -217,10 +217,10 @@ var media_manager = { // FIXME these lines deactivate the media options dialog and restore // the old behavior according to FS#2047 - opener.insertTags('wiki__text','{{'+id+'|','}}',''); - if(!media_manager.keepopen) window.close(); - opener.focus(); - return false; + //opener.insertTags('wiki__text','{{'+id+'|','}}',''); + //if(!media_manager.keepopen) window.close(); + //opener.focus(); + //return false; media_manager.ext = false; @@ -242,21 +242,11 @@ var media_manager = { media_manager.popup.style.top = event.pageY + 'px'; // set all buttons to outset - media_manager.outSet('media__linkbtn1'); - media_manager.outSet('media__linkbtn2'); - media_manager.outSet('media__linkbtn3'); - media_manager.outSet('media__linkbtn4'); - - media_manager.outSet('media__alignbtn0'); - media_manager.outSet('media__alignbtn1'); - media_manager.outSet('media__alignbtn2'); - media_manager.outSet('media__alignbtn3'); - - media_manager.outSet('media__sizebtn1'); - media_manager.outSet('media__sizebtn2'); - media_manager.outSet('media__sizebtn3'); - media_manager.outSet('media__sizebtn4'); - + for (var i = 1; i < 5; i++) { + media_manager.outSet('media__linkbtn' + i); + media_manager.outSet('media__alignbtn' + i); + media_manager.outSet('media__sizebtn' + i); + } if (ext == '.swf') { media_manager.ext = 'swf'; @@ -266,7 +256,7 @@ var media_manager = { $('media__linkbtn2').style.display = 'none'; // set the link button to default - if (media_manager.link != false) { + if (media_manager.link !== false) { if ( media_manager.link == '2' || media_manager.link == '1') { media_manager.inSet('media__linkbtn3'); media_manager.link = '3'; @@ -293,6 +283,11 @@ var media_manager = { // disable button for original size $('media__sizebtn4').style.display = 'none'; + if (media_manager.size == 4) { + media_manager.size = 2; + DokuCookie.setValue('size', '2'); + media_manager.inSet('media__sizebtn2'); + } } else { media_manager.ext = 'img'; @@ -306,7 +301,7 @@ var media_manager = { if (DokuCookie.getValue('link')) { media_manager.link = DokuCookie.getValue('link'); } - if (media_manager.link == false) { + if (!media_manager.link) { // default case media_manager.link = '1'; DokuCookie.setValue('link','1'); @@ -324,23 +319,23 @@ var media_manager = { $('media__size').style.display = 'block'; // set the align button to default - if (media_manager.align != false) { + if (media_manager.align !== false) { media_manager.inSet('media__alignbtn'+media_manager.align); } else if (DokuCookie.getValue('align')) { media_manager.inSet('media__alignbtn'+DokuCookie.getValue('align')); media_manager.align = DokuCookie.getValue('align'); } else { // default case - media_manager.align = '0'; - media_manager.inSet('media__alignbtn0'); - DokuCookie.setValue('align','0'); + media_manager.align = '1'; + media_manager.inSet('media__alignbtn1'); + DokuCookie.setValue('align','1'); } // set the size button to default if (DokuCookie.getValue('size')) { media_manager.size = DokuCookie.getValue('size'); } - if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) { + if (!media_manager.size || (media_manager.size === '4' && ext === '.swf')) { // default case media_manager.size = '2'; DokuCookie.setValue('size','2'); @@ -364,7 +359,7 @@ var media_manager = { media_manager.popup.setAttribute('id','media__popup'); var root = document.getElementById('media__manager'); - if (root == null) return; + if (root === null) return; root.appendChild(media_manager.popup); var headline = document.createElement('h1'); @@ -394,8 +389,7 @@ var media_manager = { for (var i = 0 ; i < linkbtns.length ; ++i) { var linkbtn = document.createElement('button'); linkbtn.className = 'button'; - linkbtn.value = i + 1; - linkbtn.id = "media__linkbtn" + (i + 1); + linkbtn.id = "media__linkbtn" + (i+1); linkbtn.title = LANG['media' + linkbtns[i]]; linkbtn.style.borderStyle = 'outset'; addEvent(linkbtn,'click',function(event){ return media_manager.setlink(event,this); }); @@ -427,8 +421,7 @@ var media_manager = { var alignimg = document.createElement('img'); alignimg.src = DOKU_BASE + 'lib/images/media_align_' + alignbtns[n] + '.png'; - alignbtn.id = "media__alignbtn" + n; - alignbtn.value = n; + alignbtn.id = "media__alignbtn" + (n+1); alignbtn.title = LANG['media' + alignbtns[n]]; alignbtn.className = 'button'; alignbtn.appendChild(alignimg); @@ -462,7 +455,6 @@ var media_manager = { sizebtn.className = 'button'; sizebtn.appendChild(sizeimg); - sizebtn.value = size + 1; sizebtn.id = 'media__sizebtn' + (size + 1); sizebtn.title = LANG['media' + sizebtns[size]]; sizebtn.style.borderStyle = 'outset'; @@ -516,7 +508,7 @@ var media_manager = { optsstart = true; } - var s = parseInt(media_manager.size); + var s = parseInt(media_manager.size, 10); if (s && s >= 1) { opts += (optsstart)?'&':'?'; @@ -537,15 +529,15 @@ var media_manager = { } } } - if (media_manager.align == '1') { + if (media_manager.align == '2') { alignleft = ''; alignright = ' '; } - if (media_manager.align == '2') { + if (media_manager.align == '3') { alignleft = ' '; alignright = ' '; } - if (media_manager.align == '3') { + if (media_manager.align == '4') { alignleft = ' '; alignright = ''; } @@ -671,14 +663,15 @@ var media_manager = { * @author Dominik Eckelmann */ setalign: function(event,cb){ - if(cb.value){ - DokuCookie.setValue('align',cb.value); - media_manager.align = cb.value; - media_manager.outSet("media__alignbtn0"); - media_manager.outSet("media__alignbtn1"); - media_manager.outSet("media__alignbtn2"); - media_manager.outSet("media__alignbtn3"); - media_manager.inSet("media__alignbtn"+cb.value); + + var id = cb.id.substring(cb.id.length -1); + if(id){ + DokuCookie.setValue('align',id); + media_manager.align = id; + for (var i = 1; i<=4; i++) { + media_manager.outSet("media__alignbtn" + i); + } + media_manager.inSet("media__alignbtn"+id); }else{ DokuCookie.setValue('align',''); media_manager.align = false; @@ -690,23 +683,34 @@ var media_manager = { * @author Dominik Eckelmann */ setlink: function(event,cb){ - if(cb.value){ - DokuCookie.setValue('link',cb.value); - media_manager.link = cb.value; - media_manager.outSet("media__linkbtn1"); - media_manager.outSet("media__linkbtn2"); - media_manager.outSet("media__linkbtn3"); - media_manager.outSet("media__linkbtn4"); - media_manager.inSet("media__linkbtn"+cb.value); + var id = cb.id.substring(cb.id.length -1); + if(id){ + DokuCookie.setValue('link',id); + for (var i = 1; i<=4; i++) { + media_manager.outSet("media__linkbtn"+i); + } + media_manager.inSet("media__linkbtn"+id); + var size = document.getElementById("media__size"); var align = document.getElementById("media__align"); - if (cb.value != '4') { + if (id != '4') { size.style.display = "block"; align.style.display = "block"; + if (media_manager.link == '4') { + media_manager.align = '1'; + DokuCookie.setValue('align', '1'); + media_manager.inSet('media__alignbtn1'); + + media_manager.size = '2'; + DokuCookie.setValue('size', '2'); + media_manager.inSet('media__sizebtn2'); + } + } else { size.style.display = "none"; align.style.display = "none"; } + media_manager.link = id; }else{ DokuCookie.setValue('link',''); media_manager.link = false; @@ -755,13 +759,14 @@ var media_manager = { * @author Dominik Eckelmann */ setsize: function(event,cb){ - if (cb.value) { - DokuCookie.setValue('size',cb.value); - media_manager.size = cb.value; - for (var i = 1 ; i <= 4 ; ++i) { + var id = cb.id.substring(cb.id.length -1); + if (id) { + DokuCookie.setValue('size',id); + media_manager.size = id; + for (var i = 1 ; i <=4 ; ++i) { media_manager.outSet("media__sizebtn" + i); } - media_manager.inSet("media__sizebtn"+cb.value); + media_manager.inSet("media__sizebtn"+id); } else { DokuCookie.setValue('size',''); media_manager.width = false; -- cgit v1.2.3 From cdf966f1270532404b2a6d2343ed75db32fc0b16 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 13 Nov 2010 15:48:24 +0100 Subject: removed fixme comment --- lib/scripts/media.js | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 5b9372b68..ab64298ae 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -215,14 +215,6 @@ var media_manager = { return false; } - // FIXME these lines deactivate the media options dialog and restore - // the old behavior according to FS#2047 - //opener.insertTags('wiki__text','{{'+id+'|','}}',''); - //if(!media_manager.keepopen) window.close(); - //opener.focus(); - //return false; - - media_manager.ext = false; var dot = id.lastIndexOf("."); if (dot != -1) { -- cgit v1.2.3 From 8079aa0b7aaf494a7b249671919159fd628b5dc0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Nov 2010 17:09:56 +0100 Subject: initialised media options modal popup with display:none in JS --- lib/scripts/media.js | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index ab64298ae..b90f7047b 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -349,6 +349,7 @@ var media_manager = { media_manager.popup = document.createElement('div'); media_manager.popup.setAttribute('id','media__popup'); + media_manager.popup.style.display = 'none'; var root = document.getElementById('media__manager'); if (root === null) return; -- cgit v1.2.3 From dea1115b59e771c401882590426074c08fed3a87 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 6 Mar 2011 14:33:50 +0100 Subject: Pass edid to the mediamanager --- lib/scripts/media.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b90f7047b..57f599163 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -536,7 +536,9 @@ var media_manager = { } } } - opener.insertTags('wiki__text','{{'+alignleft+id+opts+alignright+'|','}}',''); + var edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); + edid = edid ? edid[1] : 'wiki__text'; + opener.insertTags(edid,'{{'+alignleft+id+opts+alignright+'|','}}',''); if(!media_manager.keepopen) window.close(); opener.focus(); -- cgit v1.2.3 From 342e58c8c048bfd5f57f10bd88cee95aa2732e96 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 17 Apr 2011 22:39:21 +0200 Subject: correctly disable unfinished media options popup We disabled the media options shortly before the last release because of an unfixed bug. The disabling was not complete which caused problems with templates not incorporating the needed CSS. Since the option dialog hasn't been fixed yet, this patch also disables the creation of the corresponding HTML to avoid the mentioned template problems. --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 57f599163..530e93055 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -774,6 +774,6 @@ addInitEvent(function(){ media_manager.selectorattach($('media__content')); media_manager.confirmattach($('media__content')); media_manager.attachoptions($('media__opts')); - media_manager.initpopup(); + //media_manager.initpopup(); media_manager.initFlashUpload(); }); -- cgit v1.2.3 From 1f663d37c117a05d8343a100b7fac1736d24512c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 18 Apr 2011 20:23:08 +0200 Subject: Revert "correctly disable unfinished media options popup" This reverts commit 342e58c8c048bfd5f57f10bd88cee95aa2732e96. The options code had already been fixed. My mistake. --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 530e93055..57f599163 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -774,6 +774,6 @@ addInitEvent(function(){ media_manager.selectorattach($('media__content')); media_manager.confirmattach($('media__content')); media_manager.attachoptions($('media__opts')); - //media_manager.initpopup(); + media_manager.initpopup(); media_manager.initFlashUpload(); }); -- cgit v1.2.3