Fix popup routes for links and files

papayaCMS · Feb 12, 2019 · eff56c4 · eff56c4
1 parent 2eebaa7
commit eff56c4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/popup/media-files.xsl b/popup/media-files.xsl
@@ -33,11 +33,11 @@
         <title><xsl:value-of select="//popup:phrase[@identifier='File browser']"/></title>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <link rel="stylesheet" type="text/css" href="../styles/css.popup" />
-        <script type="text/javascript" src="../script/imgbrowser.js"><xsl:text> </xsl:text></script>
+        <script type="text/javascript" src="../script/imgbrowser.js"> </script>
         <script type="text/javascript">
-          var linkList = "../content.file.browser?mdb[mode]=list";
-          var linkPreview = "../content.file.browser?mdb[mode]=preview";
-          var linkThumbs = "../content.file.browser?mdb[mode]=thumbs&mdb[dialog]=no&amp;mdb[imagesonly]=0";
+          var linkList = "../content.files.browser?mdb[mode]=list";
+          var linkPreview = "../content.files.browser?mdb[mode]=preview";
+          var linkThumbs = "../content.files.browser?mdb[mode]=thumbs&amp;mdb[dialog]=no&amp;amp;mdb[imagesonly]=0";
 
           var mediaFileData = {};
           var papayaContext = null;
@@ -54,9 +54,11 @@
           function Ok() {
             if (papayaContext) {
               papayaContext.defer.resolve(mediaFileData);
-            } else if ((typeof linkedObject != 'undefined') && linkedObject != null) {
-              if (linkedObject.setMediaFileData) {
-                linkedObject.setMediaFileData(mediaFileData.id, mediaFileData);
+            } else if ((typeof linkedObject != 'undefined')) {
+              if (linkedObject != null) {
+                if (linkedObject.setMediaFileData) {
+                  linkedObject.setMediaFileData(mediaFileData.id, mediaFileData);
+                }
               }
             } else if (window.opener.setMediaFileData) {
               window.opener.setMediaFileData(mediaFileData.id, mediaFileData);

diff --git a/popup/media-images.xsl b/popup/media-images.xsl
@@ -33,11 +33,11 @@
         <title><xsl:value-of select="//popup:phrase[@identifier='Image browser']"/></title>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <link rel="stylesheet" type="text/css" href="../styles/css.popup" />
-        <script type="text/javascript" src="../script/imgbrowser.js"><xsl:text> </xsl:text></script>
+        <script type="text/javascript" src="../script/imgbrowser.js"> </script>
         <script type="text/javascript">
-          var linkList = "../content.file.browser?mdb[mode]=list";
-          var linkPreview = "../content.file.browser?mdb[mode]=preview&amp;mdb[imagesonly]=1";
-          var linkThumbs = "../content.file.browser?mdb[mode]=thumbs&amp;mdb[dialog]=no&amp;mdb[imagesonly]=1";
+          var linkList = "../content.files.browser?mdb[mode]=list";
+          var linkPreview = "../content.files.browser?mdb[mode]=preview&amp;amp;mdb[imagesonly]=1";
+          var linkThumbs = "../content.files.browser?mdb[mode]=thumbs&amp;amp;mdb[dialog]=no&amp;amp;mdb[imagesonly]=1";
 
           var mediaFileData = {};
           var papayaContext = null;
@@ -54,9 +54,11 @@
           function Ok() {
             if (papayaContext) {
               papayaContext.defer.resolve(mediaFileData);
-            } else if ((typeof linkedObject != 'undefined') &amp;&amp; linkedObject != null) {
-              if (linkedObject.setMediaFileData) {
-                linkedObject.setMediaFileData(mediaFileData.id, mediaFileData);
+            } else if ((typeof linkedObject != 'undefined')) {
+              if (linkedObject != null) {
+                if (linkedObject.setMediaFileData) {
+                  linkedObject.setMediaFileData(mediaFileData.id, mediaFileData);
+                }
               }
             } else if (window.opener.setMediaFileData) {
               window.opener.setMediaFileData(mediaFileData.id, mediaFileData);

diff --git a/script/tiny_mce3/plugins/papaya/js/file_dlg.js b/script/tiny_mce3/plugins/papaya/js/file_dlg.js
@@ -70,7 +70,7 @@ PapayaFileForm = JsonClass(
 
     browseFiles : function() {
       this.openPopup({
-        file : '../../../controls/browsemediafile.php',
+        file : '../../../../popup/media-files',
         width : Math.round(screen.width * 0.7),
         height : Math.round(screen.height * 0.7),
         name : 'papayaFileBrowser',
@@ -107,4 +107,4 @@ function setMediaFileData(fileId, fileData) {
 }
 
 PapayaFileDialog = new PapayaFileForm();
-tinyMCEPopup.onInit.add(PapayaFileDialog.init, PapayaFileDialog);
+tinyMCEPopup.onInit.add(PapayaFileDialog.init, PapayaFileDialog);
diff --git a/script/tiny_mce3/plugins/papaya/js/link_dlg.js b/script/tiny_mce3/plugins/papaya/js/link_dlg.js
@@ -317,7 +317,7 @@ PapayaLinkForm = JsonClass(
     browsePages : function(element) {
       jQuery.papayaPopUp(
         {
-          url : '../../../controls/link.php',
+          url : '../../../../popup/page',
           width : '400',
           height : '500',
           name : 'papayaPageBrowser'

diff --git a/script/tiny_mce3/plugins/papaya/js/media_dlg.js b/script/tiny_mce3/plugins/papaya/js/media_dlg.js
@@ -276,7 +276,7 @@ PapayaMediaForm = JsonClass(
 
     browseImages : function() {
       this.openPopup({
-        file : '../../../controls/browseimg.php',
+        file : '../../../../popup/media-images',
         width : Math.round(screen.width * 0.7),
         height : Math.round(screen.height * 0.7),
         name : 'papayaMediaBrowser',
@@ -517,7 +517,7 @@ PapayaMediaForm = JsonClass(
 
     browsePages : function(f) {
       this.openPopup({
-        file : '../../../controls/link.php',
+        file : '../../../../popup/page',
         width : '400',
         height : '500',
         name : 'papayaPageBrowser',