renamed dmMedia module to dmCkEditor and made some changes inside, mi…

…nor changes in ckeditor.dmMedia plugin
ornicar · Mar 7, 2010 · 354e96a · 354e96a
1 parent c4d360b
commit 354e96a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/modules/dmCkEditor/actions/actions.class.php b/modules/dmCkEditor/actions/actions.class.php
@@ -0,0 +1,25 @@
+<?php
+
+class dmCkEditorActions extends dmBaseActions
+{
+
+  public function executeMedia(dmWebRequest $request)
+  {
+    $this->forward404Unless(
+      ($mediaId = $request->getParameter('id')) &&
+      ($media = dmDb::table('DmMedia')->findOneByIdWithFolder($mediaId))
+    );
+
+    return $this->renderText($this->getHelper()->media($media)->set('#ck-media-' . $mediaId));
+  }
+
+  public function executePage(dmWebRequest $request)
+  {
+    $this->forward404Unless(
+      ($pageId = $request->getParameter('id')) &&
+      ($page = dmDb::table('DmPage')->findOneByIdWithI18n($pageId))
+    );
+
+    return $this->renderText($this->getHelper()->link($page)->set('#dmPage-' . $pageId));
+  }
+}
diff --git a/modules/dmMedia/actions/actions.class.php b/modules/dmMedia/actions/actions.class.php
diff --git a/web/js/ckeditor/plugins/dmMedia/plugin.js b/web/js/ckeditor/plugins/dmMedia/plugin.js
@@ -38,17 +38,18 @@ CKEDITOR.plugins.add('dmMedia',
 
     CKEDITOR.instances[editor.name].on('instanceReady', function() {
       var overlayid;
-      $('.image.ui-draggable').live('dragstart', function(event, ui) {
-        overlayid = createOverlay(editor, $.dm.ctrl.getHref('+/dmMedia/index/id/'));
-      });
 
       $('#dm_page_tree li.ui-draggable').live('dragstart', function(event, ui){
-        overlayid = createOverlay(editor, $.dm.ctrl.getHref('+/dmMedia/page/id/'));
+        overlayid = createOverlay(editor, $.dm.ctrl.getHref('+/dmCkEditor/page/id/'));
       });
 
       $('#dm_page_tree li.ui-draggable').live('dragstop', function(event, ui) {
         $('#' + overlayid).remove();
       });
+
+      $('.image.ui-draggable').live('dragstart', function(event, ui) {
+        overlayid = createOverlay(editor, $.dm.ctrl.getHref('+/dmCkEditor/media/id/'));
+      });
 
       $('.image.ui-draggable').live('dragstop', function(event, ui) {
         $('#' + overlayid).remove();