From: Benoît Pin Date: Fri, 11 Apr 2014 12:10:33 +0000 (+0200) Subject: Bugfix. Mise en forme du code. X-Git-Url: https://scm.cri.ensmp.fr/git/ckeditor.git/commitdiff_plain/1cf0ceefbf8c570d340e08550253ec57c1267c03?ds=inline Bugfix. Mise en forme du code. --- diff --git a/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml b/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml index 0b3234a..300fcfc 100644 --- a/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml +++ b/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml @@ -64,10 +64,10 @@ return; li = li.parentNode; case 'LI': - // click on the current selected row - if (currentColumn == li.parentNode && currentColumn.currentRow == li) - return; - + // click on the current selected row + if (currentColumn == li.parentNode && currentColumn.currentRow == li) + return; + currentColumn = li.parentNode; // hightlight row if (currentColumn.currentRow) { @@ -82,34 +82,34 @@ } function onDblClickHandler(evt) { - var li = getTargetedObject(evt); + var li = getTargetedObject(evt); - if(li.tagName != 'LI') { - if (li.tagName == 'IMG' && li.parentNode.tagName == 'LI') - li = t.parentNode; - else - return; - } - switch(window.parent.name) { - case 'PlinnImageDialog' : - if (li.className == 'contentish-selected') { - window.parent.updateOrInsertImage(li.link); - window.close(); - } - break; - case 'StandaloneBrowser' : - if (li.className == 'contentish-selected') { - window.opener.SetUrl(li.link); - window.close(); - } - break; - case '' : - case '_blank' : - var funcNum = GetUrlParam('CKEditorFuncNum'); - window.opener.CKEDITOR.tools.callFunction(funcNum, li.link); - window.close(); - break; - } + if(li.tagName != 'LI') { + if (li.tagName == 'IMG' && li.parentNode.tagName == 'LI') + li = t.parentNode; + else + return; + } + console.log('dblclick !', li, window.parent); + switch(window.parent.name) { + case 'PlinnImageDialog' : + if (li.className == 'contentish-selected') { + window.parent.updateOrInsertImage(li.link); + window.close(); + } + break; + case 'StandaloneBrowser' : + if (li.className == 'contentish-selected') { + window.opener.SetUrl(li.link); + window.close(); + } + break; + default : + var funcNum = GetUrlParam('CKEditorFuncNum'); + window.opener.CKEDITOR.tools.callFunction(funcNum, li.link); + window.close(); + break; + } } function onKeydownHandler(evt) { @@ -304,20 +304,20 @@ createLinkBtn.appendChild(document.createTextNode(text)); createLinkBtn.onclick = function(){ - var url = respDom.lastChild.firstChild.nodeValue; - switch(window.parent.name) { - case 'PlinnImageDialog' : - window.parent.updateOrInsertImage(url); - break; - case 'StandaloneBrowser' : - window.opener.SetUrl(url); - break; - default: - var funcNum = GetUrlParam('CKEditorFuncNum'); - window.opener.CKEDITOR.tools.callFunction(funcNum, url); - break; - } - window.close(); + var url = respDom.lastChild.firstChild.nodeValue; + switch(window.parent.name) { + case 'PlinnImageDialog' : + window.parent.updateOrInsertImage(url); + break; + case 'StandaloneBrowser' : + window.opener.SetUrl(url); + break; + default: + var funcNum = GetUrlParam('CKEditorFuncNum'); + window.opener.CKEDITOR.tools.callFunction(funcNum, url); + break; + } + window.close(); }; list.appendChild(li); @@ -349,7 +349,7 @@ - +
  • Folder