Merge branch 'master' into 'master'

[BUGFIX] Allow file:// links in Element Browser

see http://review.typo3.org/37329

See merge request !5

Resources/Public/Plugins/Typo3FileManager/typo3filemanager.js

@@ -86,7 +86,7 @@ var plugin = tinymce.PluginManager.add('typo3filemanager', function(editor, url)
 
 		var additionalParameter = '';
 		if (element) {
-			additionalParameter = '&curUrl[url]=' + encodeURIComponent(element.href);
+			additionalParameter = '&curUrl[url]=' + encodeURIComponent(element.getAttribute('href'));
 			if (element.target) {
 				additionalParameter += '&curUrl[target]=' + encodeURIComponent(element.target);
 			}

Resources/Public/Plugins/Typo3FileManager/typo3filemanager.min.js

-tinymce.PluginManager.requireLangPack("typo3filemanager","en_GB,de");var plugin=tinymce.PluginManager.add("typo3filemanager",function(t,e){var n=function(e,n){var i=t.id;return e+(-1===e.indexOf("?")?"?":"&")+"&RTEtsConfigParams="+RTEarea[i].RTEtsConfigParams+"&sys_language_content="+RTEarea[i].sys_language_content+"&contentTypo3Language="+RTEarea[i].typo3ContentLanguage+"&editorNo="+RTEarea[i].number+(n?n:"")},i=function(){var e=t.selection.getNode(),i=t.dom.getParent(e,"a[href]"),o="";i&&(o="&curUrl[url]="+encodeURIComponent(i.href),i.target&&(o+="&curUrl[target]="+encodeURIComponent(i.target)),i.className&&(o+="&curUrl[class]="+encodeURIComponent(i.className)),i.title&&(o+="&curUrl[title]="+encodeURIComponent(i.title))),t.windowManager.open({title:"TYPO3 Link",url:n(RTEarea[t.id].buttons.link.pathLinkModule,o),width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})};t.addButton("typo3link",{title:"TYPO3 Link",icon:"link",shortcut:"Ctrl+K",onclick:i,stateSelector:"a[href]"}),t.addButton("unlink",{title:"Unlink",icon:"unlink",shortcut:"Ctrl+M",cmd:"unlink",stateSelector:"a[href]"}),t.addMenuItem("unlink",{text:"Unlink",context:"insert",prependToContext:!0,shortcut:"Ctrl+M",icon:"unlink",cmd:"unlink",stateSelector:"a[href]"}),t.addMenuItem("typo3link",{text:"TYPO3 Link",context:"insert",prependToContext:!0,shortcut:"Ctrl+K",icon:"link",onclick:i,stateSelector:"a[href]"}),t.addShortcut("Ctrl+K","",i),t.addShortcut("Ctrl+M","","unlink")});plugin.createLink=function(t,e,n,i,o){var a={href:t,target:e?e:null,"class":n?n:null,title:i?i:null,"data-htmlarea-external":null};for(var r in o)o.hasOwnProperty(r)&&(a[r]=o[r]);var c=tinymce.activeEditor.selection.getNode(),l=tinymce.activeEditor.dom.getParent(c,"a[href]");l?(tinymce.activeEditor.focus(),tinymce.activeEditor.dom.setAttribs(l,a),tinymce.activeEditor.selection.select(l),tinymce.activeEditor.undoManager.add()):tinymce.activeEditor.execCommand("mceInsertLink",!1,a),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.unLink=function(){tinymce.activeEditor.execCommand("unlink"),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.insertImage=function(t){tinymce.activeEditor.focus(),tinymce.activeEditor.selection.setContent(t),tinymce.activeEditor.undoManager.add(),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.getButton=function(){return null},plugin.getSelectedImage=function(){var t=tinymce.activeEditor.$(tinymce.activeEditor.selection.getNode());return t.length?t.closest("img[src]"):{}},plugin.close=function(){tinymce.activeEditor.windowManager.getWindows()[0].close()};
\ No newline at end of file
+tinymce.PluginManager.requireLangPack("typo3filemanager","en_GB,de");var plugin=tinymce.PluginManager.add("typo3filemanager",function(t,e){var n=function(e,n){var i=t.id;return e+(-1===e.indexOf("?")?"?":"&")+"&RTEtsConfigParams="+RTEarea[i].RTEtsConfigParams+"&sys_language_content="+RTEarea[i].sys_language_content+"&contentTypo3Language="+RTEarea[i].typo3ContentLanguage+"&editorNo="+RTEarea[i].number+(n?n:"")},i=function(){var e=t.selection.getNode(),i=t.dom.getParent(e,"a[href]"),o="";i&&(o="&curUrl[url]="+encodeURIComponent(i.getAttribute("href")),i.target&&(o+="&curUrl[target]="+encodeURIComponent(i.target)),i.className&&(o+="&curUrl[class]="+encodeURIComponent(i.className)),i.title&&(o+="&curUrl[title]="+encodeURIComponent(i.title))),t.windowManager.open({title:"TYPO3 Link",url:n(RTEarea[t.id].buttons.link.pathLinkModule,o),width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})};t.addButton("typo3link",{title:"TYPO3 Link",icon:"link",shortcut:"Ctrl+K",onclick:i,stateSelector:"a[href]"}),t.addButton("unlink",{title:"Unlink",icon:"unlink",shortcut:"Ctrl+M",cmd:"unlink",stateSelector:"a[href]"}),t.addMenuItem("unlink",{text:"Unlink",context:"insert",prependToContext:!0,shortcut:"Ctrl+M",icon:"unlink",cmd:"unlink",stateSelector:"a[href]"}),t.addMenuItem("typo3link",{text:"TYPO3 Link",context:"insert",prependToContext:!0,shortcut:"Ctrl+K",icon:"link",onclick:i,stateSelector:"a[href]"}),t.addShortcut("Ctrl+K","",i),t.addShortcut("Ctrl+M","","unlink")});plugin.createLink=function(t,e,n,i,o){var a={href:t,target:e?e:null,"class":n?n:null,title:i?i:null,"data-htmlarea-external":null};for(var r in o)o.hasOwnProperty(r)&&(a[r]=o[r]);var c=tinymce.activeEditor.selection.getNode(),l=tinymce.activeEditor.dom.getParent(c,"a[href]");l?(tinymce.activeEditor.focus(),tinymce.activeEditor.dom.setAttribs(l,a),tinymce.activeEditor.selection.select(l),tinymce.activeEditor.undoManager.add()):tinymce.activeEditor.execCommand("mceInsertLink",!1,a),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.unLink=function(){tinymce.activeEditor.execCommand("unlink"),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.insertImage=function(t){tinymce.activeEditor.focus(),tinymce.activeEditor.selection.setContent(t),tinymce.activeEditor.undoManager.add(),tinymce.activeEditor.windowManager.getWindows()[0].close()},plugin.getButton=function(){return null},plugin.getSelectedImage=function(){var t=tinymce.activeEditor.$(tinymce.activeEditor.selection.getNode());return t.length?t.closest("img[src]"):{}},plugin.close=function(){tinymce.activeEditor.windowManager.getWindows()[0].close()};
\ No newline at end of file