Ability to open FM in modal window (closing issue #205)

simogeo · Apr 23, 2014 · e0bf089 · e0bf089
1 parent c8629c1
commit e0bf089
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 47 deletions.
diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -122,6 +122,8 @@ var setDimensions = function(){
 	var bheight = 20;
 
 	if(config.options.searchBox === true) bheight +=33;
+
+	if($.urlParam('CKEditorCleanUpFuncNum')) bheight +=60;
 
 	var newH = $(window).height() - $('#uploader').height() - bheight;	
 	$('#splitter, #filetree, #fileinfo, .vsplitbar').height(newH);
@@ -557,7 +559,7 @@ var selectItem = function(data) {
 		var url = relPath + data['Path'];
 	}
 
-	if(window.opener || window.tinyMCEPopup || $.urlParam('field_name')){
+	if(window.opener || window.tinyMCEPopup || $.urlParam('CKEditorCleanUpFuncNum') || $.urlParam('CKEditor')) {
 	 	if(window.tinyMCEPopup){
         	// use TinyMCE > 3.0 integration method
             var win = tinyMCEPopup.getWindowArg("window");
@@ -587,8 +589,15 @@ var selectItem = function(data) {
 	 	}
 
 		else if($.urlParam('CKEditor')){
-			// use CKEditor 3.0 integration method
-			window.opener.CKEDITOR.tools.callFunction($.urlParam('CKEditorFuncNum'), url);
+			// use CKEditor 3.0 + integration method
+			if (window.opener) {
+				// Popup
+				window.opener.CKEDITOR.tools.callFunction($.urlParam('CKEditorFuncNum'), url);
+			} else {
+				// Modal (in iframe)
+				parent.CKEDITOR.tools.callFunction($.urlParam('CKEditorFuncNum'), url);
+				parent.CKEDITOR.tools.callFunction($.urlParam('CKEditorCleanUpFuncNum'));
+			}
 		} else {
 			// use FCKEditor 2.0 integration method
 			if(data['Properties']['Width'] != ''){
@@ -601,7 +610,9 @@ var selectItem = function(data) {
 			}		
 		}
 
-		window.close();
+		if (window.opener) {
+			window.close();
+		}
 	} else {
 		$.prompt(lg.fck_select_integration);
 	}
@@ -1183,7 +1194,7 @@ var getFileInfo = function(file) {
 	var template = '<div id="preview"><img /><h1></h1><dl></dl></div>';
 	template += '<form id="toolbar">';
 	template += '<button id="parentfolder">' + lg.parentfolder + '</button>';
-	if($.inArray('select', capabilities)  != -1 && (window.opener || window.tinyMCEPopup || $.urlParam('field_name'))) template += '<button id="select" name="select" type="button" value="Select">' + lg.select + '</button>';
+	if($.inArray('select', capabilities)  != -1 && ($.urlParam('CKEditor') || window.opener || window.tinyMCEPopup || $.urlParam('field_name'))) template += '<button id="select" name="select" type="button" value="Select">' + lg.select + '</button>';
 	if($.inArray('download', capabilities)  != -1) template += '<button id="download" name="download" type="button" value="Download">' + lg.download + '</button>';
 	if($.inArray('rename', capabilities)  != -1 && config.options.browseOnly != true) template += '<button id="rename" name="rename" type="button" value="Rename">' + lg.rename + '</button>';
 	if($.inArray('move', capabilities)  != -1 && config.options.browseOnly != true) template += '<button id="move" name="move" type="button" value="Move">' + lg.move + '</button>';
@@ -1497,6 +1508,15 @@ $(function(){
 		$('#itemOptions a[href$="#delete"]').append(lg.del);
 	}
 
+	/** Adding a close button triggering callback function if CKEditorCleanUpFuncNum passed */
+	if($.urlParam('CKEditorCleanUpFuncNum')) {
+		$("body").append('<button id="close-btn" type="button">' + lg.close + '</button>');
+
+		$('#close-btn').click(function () {
+			parent.CKEDITOR.tools.callFunction($.urlParam('CKEditorCleanUpFuncNum'));
+		});
+	}
+
 	/** Input file Replacement */
 	$('#browse').append('+');
 	$('#browse').attr('title', lg.browse);

diff --git a/scripts/filemanager.min.js b/scripts/filemanager.min.js
diff --git a/scripts/languages/ca.js b/scripts/languages/ca.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Cancel·lar", 
+    "close": "Close", 
     "confirmation_delete": "Estàs segur de voler eliminar aquest arxiu?", 
     "could_not_retrieve_folder": "No s'ha pogut recuperar el contingut de la carpeta.", 
     "create_folder": "Crear una carpeta", 

diff --git a/scripts/languages/cs.js b/scripts/languages/cs.js
@@ -28,6 +28,7 @@
     "browse": "Procházet...", 
     "bytes": " bajtů", 
     "cancel": "Zrušit", 
+    "close": "Close", 
     "confirmation_delete": "Jste si opravdu jistí, že chcete smazat tuto položku?", 
     "could_not_retrieve_folder": "Došlo k chybě při načítání obsahu adresáře.", 
     "create_folder": "Vytvořit adresář", 

diff --git a/scripts/languages/da.js b/scripts/languages/da.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Annullér", 
+    "close": "Close", 
     "confirmation_delete": "Er du sikker på du ønsker at slette filen?", 
     "could_not_retrieve_folder": "Var ude af stand til at modtage mappens indhold.", 
     "create_folder": "Opret mappe", 

diff --git a/scripts/languages/de.js b/scripts/languages/de.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Abbruch", 
+    "close": "Close", 
     "confirmation_delete": "Möchtest Du wirklich diese Datei löschen?", 
     "could_not_retrieve_folder": "Konnte Ordnerinhalt nicht lesen.", 
     "create_folder": "Ordner erstellen", 

diff --git a/scripts/languages/en-gb.js b/scripts/languages/en-gb.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Cancel", 
+    "close": "Close", 
     "confirmation_delete": "Are you sure you wish to delete this file?", 
     "could_not_retrieve_folder": "Could not retrieve folder contents.", 
     "create_folder": "Create Folder", 

diff --git a/scripts/languages/en.js b/scripts/languages/en.js
@@ -35,6 +35,7 @@
     "current_folder": "Current folder: ", 
     "default_foldername": "My folder", 
     "del": "Delete", 
+    "close": "Close",
     "dimensions": "Dimensions", 
     "download": "Download", 
     "fck_select_integration": "The 'Select' function is only used for integration with FCKEditor.", 

diff --git a/scripts/languages/es.js b/scripts/languages/es.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Cancelar", 
+    "close": "Close", 
     "confirmation_delete": "¿Estás seguro de eliminar este archivo?", 
     "could_not_retrieve_folder": "No se ha podido recuperar el contenido de la carpeta.", 
     "create_folder": "Crear carpeta", 

diff --git a/scripts/languages/fi.js b/scripts/languages/fi.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " tavua", 
     "cancel": "Peruuta", 
+    "close": "Close", 
     "confirmation_delete": "Oletko varma, että haluat poistaa kyseisen tiedoston?", 
     "could_not_retrieve_folder": "Ei voitu lukea hakemiston sisältöä.", 
     "create_folder": "Luo hakemisto", 

diff --git a/scripts/languages/fr.js b/scripts/languages/fr.js
@@ -28,6 +28,7 @@
     "browse": "Parcourir...", 
     "bytes": " octets", 
     "cancel": "Annuler", 
+    "close": "Fermer", 
     "confirmation_delete": "Etes-vous sûr de vouloir supprimer ce fichier?", 
     "could_not_retrieve_folder": "Le contenu du dossier est inaccessible.", 
     "create_folder": "Créer un dossier", 

diff --git a/scripts/languages/he.js b/scripts/languages/he.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "ביטול", 
+    "close": "Close", 
     "confirmation_delete": "?האם אתה בטוח שברצונך למחוק קובץ זה", 
     "could_not_retrieve_folder": "לא ניתן לקרוא את תוכן התיקייה", 
     "create_folder": "צור תיקייה", 

diff --git a/scripts/languages/hu.js b/scripts/languages/hu.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " byte", 
     "cancel": "Mégse", 
+    "close": "Close", 
     "confirmation_delete": "Biztosan törölni szeretné a kijelölt fájlt?", 
     "could_not_retrieve_folder": "A mappa tartalmát nem lehet megjeleníteni.", 
     "create_folder": "Új mappa", 

diff --git a/scripts/languages/it.js b/scripts/languages/it.js
@@ -28,6 +28,7 @@
     "browse": "Sfoglia...", 
     "bytes": " bytes", 
     "cancel": "Annulla", 
+    "close": "Close", 
     "confirmation_delete": "Sei sicuro di voler eliminare il file?", 
     "could_not_retrieve_folder": "Impossibile visualizzare il contenuto della cartella.", 
     "create_folder": "Crea cartella", 

diff --git a/scripts/languages/ja.js b/scripts/languages/ja.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": "バイト", 
     "cancel": "キャンセル", 
+    "close": "Close", 
     "confirmation_delete": "本当にこのファイルを削除してもいいですか?", 
     "could_not_retrieve_folder": "フォルダーの内容を検索できませんできた.", 
     "create_folder": "フォルダーを作成", 

diff --git a/scripts/languages/nl.js b/scripts/languages/nl.js
@@ -28,6 +28,7 @@
     "browse": "Bladeren...", 
     "bytes": " bytes", 
     "cancel": "Annuleren", 
+    "close": "Close", 
     "confirmation_delete": "Weet je zeker dat je dit bestand wilt verwijderen?", 
     "could_not_retrieve_folder": "Kon map-inhoud niet ophalen.", 
     "create_folder": "Nieuwe Map", 

diff --git a/scripts/languages/pl.js b/scripts/languages/pl.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Anuluj", 
+    "close": "Close", 
     "confirmation_delete": "Czy na pewno chcesz usunąć wybrany plik?", 
     "could_not_retrieve_folder": "Nie udało się otworzyć folderu.", 
     "create_folder": "Utwórz folder", 

diff --git a/scripts/languages/pt.js b/scripts/languages/pt.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Cancelar", 
+    "close": "Close", 
     "confirmation_delete": "Tem certeza que deseja excluir este arquivo?", 
     "could_not_retrieve_folder": "Não foi possivel ler o conteúdo da pasta.", 
     "create_folder": "Criar Pasta", 

diff --git a/scripts/languages/ru.js b/scripts/languages/ru.js
@@ -28,6 +28,7 @@
     "browse": "...", 
     "bytes": " байт", 
     "cancel": "Отмена", 
+    "close": "Close", 
     "confirmation_delete": "Вы уверены, что хотите удалить этот файл?", 
     "could_not_retrieve_folder": "Не могу получить содержимое папки.", 
     "create_folder": "Создать папку", 

diff --git a/scripts/languages/sv.js b/scripts/languages/sv.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Avbryt", 
+    "close": "Close", 
     "confirmation_delete": "Är du säker på att du vill radera filen?", 
     "could_not_retrieve_folder": "Kan ej läsa mappens innehåll.", 
     "create_folder": "Skapa mapp", 

diff --git a/scripts/languages/tr.js b/scripts/languages/tr.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bayt", 
     "cancel": "İptal", 
+    "close": "Close", 
     "confirmation_delete": "Dosyayı silmek istediğnizden emin misiniz?", 
     "could_not_retrieve_folder": "Klasör içerikleri getirilemiyor.", 
     "create_folder": "Klasör Oluştur", 

diff --git a/scripts/languages/vn.js b/scripts/languages/vn.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "Hủy bỏ", 
+    "close": "Close", 
     "confirmation_delete": "Bạn chắc chắn muốn xóa tập tin này?", 
     "could_not_retrieve_folder": "Không lấy được nội dung thư mục.", 
     "create_folder": "Tạo thư mục", 

diff --git a/scripts/languages/zh-cn.js b/scripts/languages/zh-cn.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "取消", 
+    "close": "Close", 
     "confirmation_delete": "你确定要删除这个文件吗？", 
     "could_not_retrieve_folder": "无法取得文件夹的内容。", 
     "create_folder": "创建文件夹", 

diff --git a/scripts/languages/zh-tw.js b/scripts/languages/zh-tw.js
@@ -28,6 +28,7 @@
     "browse": "Browse...", 
     "bytes": " bytes", 
     "cancel": "取消", 
+    "close": "Close", 
     "confirmation_delete": "確定刪除檔案？", 
     "could_not_retrieve_folder": "無法取得目錄內容", 
     "create_folder": "建立目錄",