added the ckeditor dmMedia plugin by default, fixed media url when si…

…te does not live in the domain root
ornicar · Mar 7, 2010 · c4d360b · c4d360b
1 parent 4fc93c3
commit c4d360b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/config/dm/config.yml b/config/dm/config.yml
@@ -10,5 +10,7 @@ default:
         - ['Image','HorizontalRule','SpecialChar']
 
       resize_enabled:     false
-
+
+      extraPlugins:       dmMedia
+
       customConfig:       ''
diff --git a/web/js/ckeditor/plugins/dmMedia/plugin.js b/web/js/ckeditor/plugins/dmMedia/plugin.js
@@ -6,53 +6,53 @@
 function createOverlay(editor, link) {
 
   var overlayid = 'drag_box_' + editor.name;
-	$editor = $('#cke_' + editor.name);
-	var offset = $editor.offset();
-	$(document.body).append('<div id="'+overlayid+'"><input style="width: 100%; height: 100%;"></input></div>');
-	 
-	$('#' + overlayid).css({
-		position: 'absolute',
-		left: offset.left + 'px',
-		top: offset.top + 'px',
-		height: $editor.height() + 'px',
-		width: $editor.width() + 'px',
-		backgroundColor: 'white',
-		opacity: 0.5,
-		zIndex: 1000,
-		display: 'block'
-	}).find('input:first').dmDroppableInput(function() {
+  $editor = $('#cke_' + editor.name);
+  var offset = $editor.offset();
+  $(document.body).append('<div id="'+overlayid+'"><input style="width: 100%; height: 100%;"></input></div>');
+
+  $('#' + overlayid).css({
+    position: 'absolute',
+    left: offset.left + 'px',
+    top: offset.top + 'px',
+    height: $editor.height() + 'px',
+    width: $editor.width() + 'px',
+    backgroundColor: 'white',
+    opacity: 0.5,
+    zIndex: 1000,
+    display: 'block'
+  }).find('input:first').dmDroppableInput(function() {
     $.ajax({
       url: link + $(this).val().split(' ')[0].split(':')['1'],
       success: function(src) {
         editor.setData(src + editor.getData());
       }
     });
   });
-	return overlayid;
+  return overlayid;
 }
 
 CKEDITOR.plugins.add('dmMedia',
 {
   init: function(editor)
   {
 
-		CKEDITOR.instances[editor.name].on('instanceReady', function() {
+    CKEDITOR.instances[editor.name].on('instanceReady', function() {
       var overlayid;
-	    $('.image.ui-draggable').live('dragstart', function(event, ui) {
-        overlayid = createOverlay(editor, '/admin.php/+/dmMedia/index/id/');			 	
+      $('.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, '/admin.php/+/dmMedia/page/id/');
-			});
-			
+      $('#dm_page_tree li.ui-draggable').live('dragstart', function(event, ui){
+        overlayid = createOverlay(editor, $.dm.ctrl.getHref('+/dmMedia/page/id/'));
+      });
+
       $('#dm_page_tree li.ui-draggable').live('dragstop', function(event, ui) {
         $('#' + overlayid).remove();
       });
-			
+
       $('.image.ui-draggable').live('dragstop', function(event, ui) {
         $('#' + overlayid).remove();
       });
-		});
+    });
   }
 });