Vlad Kurkin (b_vladi) wrote in changelog,
Vlad Kurkin
b_vladi
changelog

[livejournal] r19699: LJSUP-9159: Update and improve RTE by CK...

Committer: vkurkin
LJSUP-9159: Update and improve RTE by CKEditor 3.6.1
U   trunk/htdocs/js/ck/plugins/livejournal/plugin.js
Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js
===================================================================
--- trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2011-08-11 07:02:46 UTC (rev 19698)
+++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2011-08-11 07:33:32 UTC (rev 19699)
@@ -87,13 +87,16 @@
 				}
 
 				var isMouseOver = evt.name == 'mouseover';
-				var node = isMouseOver ? evt.data.getTarget() : editor.getSelection().getStartElement();
+				var node = isMouseOver ? evt.data.getTarget() : editor.getSelection().getRanges()[0].startContainer;
 				var actNode;
 
+				if(node.type != 1){
+					node = node.getParent();
+				}
+
 				while (node) {
-
 					if (!attr) {
-						if (node.is('img')) {
+						if (node.type == 1 && node.is('img')) {
 							node.setAttribute('lj-cmd', 'LJImage');
 						} else if (node.is('a')) {
 							node.setAttribute('lj-cmd', 'LJLink');
@@ -458,10 +461,10 @@
 				exec : function(editor) {
 					if (window.ljphotoEnabled) {
 						jQuery('#updateForm').photouploader({
-																									type: 'upload'
-																								}).photouploader('show').bind('htmlready', function (event, html) {
-							editor.insertHtml(html);
-						});
+							type: 'upload'
+						}).photouploader('show').bind('htmlready', function (event, html) {
+								editor.insertHtml(html);
+							});
 					} else {
 						if (ljNoteData.LJImage.node) {
 							editor.getSelection().selectElement(ljNoteData.LJImage.node);
@@ -496,7 +499,7 @@
 
 			//////////  LJ Link Button //////////////
 			editor.addCommand('LJLink', {
-				exec : function(editor) {
+				exec: function(editor) {
 					if (ljNoteData.LJLink.node) {
 						editor.getSelection().selectElement(ljNoteData.LJLink.node);
 					}

Tags: b_vladi, js, livejournal
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments