rails_kindeditor 0.3.4 → 0.3.5

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end
 

data/vendor/assets/javascripts/kindeditor/kindeditor.js

@@ -5,7 +5,7 @@
 * @author Roddy <luolonghao@gmail.com>
 * @website http://www.kindsoft.net/
 * @licence http://www.kindsoft.net/license.php
-* @version 4.1.1 (2012-06-10)
+* @version 4.1.2 (2012-07-21)
 *******************************************************************************/
 (function (window, undefined) {
 	if (window.KindEditor) {
@@ -17,7 +17,7 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.1 (2012-06-10)',
+var _VERSION = '4.1.2 (2012-07-21)',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
@@ -243,7 +243,7 @@ K.options = {
 	pasteType : 2,
 	dialogAlignType : 'page',
 	useContextmenu : true,
-	fullscreenShortcut : true,
+	fullscreenShortcut : false,
 	bodyClass : 'ke-content',
 	indentChar : '\t',
 	cssPath : '',
@@ -636,7 +636,9 @@ function _formatCss(css) {
 }
 function _formatUrl(url, mode, host, pathname) {
 	mode = _undef(mode, '').toLowerCase();
-	url = url.replace(/([^:])\/\//g, '$1/');
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
 	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
 		return url;
 	}
@@ -712,6 +714,7 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
 	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
 	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
 	var htmlTagMap = {};
 	if (htmlTags) {
 		_each(htmlTags, function(key, val) {
@@ -1279,7 +1282,6 @@ _extend(KNode, {
 		self.name = _getNodeName(self[0]);
 		self.type = self.length > 0 ? self[0].nodeType : null;
 		self.win = _getWin(self[0]);
-		self._data = {};
 	},
 	each : function(fn) {
 		var self = this;
@@ -1473,10 +1475,16 @@ _extend(KNode, {
 	},
 	data : function(key, val) {
 		var self = this;
+		key = 'kindeditor_data_' + key;
 		if (val === undefined) {
-			return self._data[key];
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
 		}
-		self._data[key] = val;
+		this.each(function() {
+			this[key] = val;
+		});
 		return self;
 	},
 	pos : function() {
@@ -1577,14 +1585,25 @@ _extend(KNode, {
 			delete self[i];
 		});
 		self.length = 0;
-		self._data = {};
 		return self;
 	},
 	show : function(val) {
-		return this.css('display', val === undefined ? 'block' : val);
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
 	},
 	hide : function() {
-		return this.css('display', 'none');
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
 	},
 	outer : function() {
 		var self = this;
@@ -1737,6 +1756,9 @@ K = function(expr, root) {
 	if (expr && expr.constructor === KNode) {
 		return expr;
 	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
 	if (_isArray(expr)) {
 		return newNode(expr);
 	}
@@ -1745,6 +1767,7 @@ K = function(expr, root) {
 _each(_K, function(key, val) {
 	K[key] = val;
 });
+K.NodeClass = KNode;
 window.KindEditor = K;
 var _START_TO_START = 0,
 	_START_TO_END = 1,
@@ -2451,6 +2474,7 @@ function _range(mixed) {
 	}
 	return new KRange(mixed);
 }
+K.RangeClass = KRange;
 K.range = _range;
 K.START_TO_START = _START_TO_START;
 K.START_TO_END = _START_TO_END;
@@ -3094,9 +3118,6 @@ _extend(KCmd, {
 		if (val === '') {
 			return self;
 		}
-		if (_inPreElement(K(range.startContainer))) {
-			return self;
-		}
 		function pasteHtml(range, val) {
 			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
 			var rng = range.get();
@@ -3248,6 +3269,7 @@ function _cmd(mixed) {
 	}
 	return new KCmd(mixed);
 }
+K.CmdClass = KCmd;
 K.cmd = _cmd;
 function _drag(options) {
 	var moveEl = options.moveEl,
@@ -3255,9 +3277,7 @@ function _drag(options) {
 		clickEl = options.clickEl || moveEl,
 		beforeDrag = options.beforeDrag,
 		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
-	var docs = [document],
-		poss = [{ x : 0, y : 0}],
-		listeners = [];
+	var docs = [document];
 	if (iframeFix) {
 		K('iframe').each(function() {
 			var doc;
@@ -3268,57 +3288,47 @@ function _drag(options) {
 				doc = null;
 			}
 			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
 				docs.push(doc);
-				poss.push(K(this).pos());
 			}
 		});
 	}
 	clickEl.mousedown(function(e) {
+		e.stopPropagation();
 		var self = clickEl.get(),
 			x = _removeUnit(moveEl.css('left')),
 			y = _removeUnit(moveEl.css('top')),
 			width = moveEl.width(),
 			height = moveEl.height(),
 			pageX = e.pageX,
-			pageY = e.pageY,
-			dragging = true;
+			pageY = e.pageY;
 		if (beforeDrag) {
 			beforeDrag();
 		}
-		_each(docs, function(i, doc) {
-			function moveListener(e) {
-				if (dragging) {
-					var diffX = _round(poss[i].x + e.pageX - pageX),
-						diffY = _round(poss[i].y + e.pageY - pageY);
-					moveFn.call(clickEl, x, y, width, height, diffX, diffY);
-				}
-				e.stop();
-			}
-			function selectListener(e) {
-				e.stop();
-			}
-			function upListener(e) {
-				dragging = false;
-				if (self.releaseCapture) {
-					self.releaseCapture();
-				}
-				_each(listeners, function() {
-					K(this.doc).unbind('mousemove', this.move)
-						.unbind('mouseup', this.up)
-						.unbind('selectstart', this.select);
-				});
-				e.stop();
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
 			}
-			K(doc).mousemove(moveListener)
-				.mouseup(upListener)
-				.bind('selectstart', selectListener);
-			listeners.push({
-				doc : doc,
-				move : moveListener,
-				up : upListener,
-				select : selectListener
-			});
-		});
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
 		if (self.setCapture) {
 			self.setCapture();
 		}
@@ -3433,7 +3443,7 @@ _extend(KWidget, {
 	},
 	remove : function() {
 		var self = this;
-		if (_IE && _V < 7) {
+		if (_IE && _V < 7 || _QUIRKS) {
 			K(self.win).unbind('scroll');
 		}
 		self.div.remove();
@@ -3772,6 +3782,7 @@ _extend(KEdit, KWidget, {
 function _edit(options) {
 	return new KEdit(options);
 }
+K.EditClass = KEdit;
 K.edit = _edit;
 K.iframeDoc = _iframeDoc;
 function _selectToolbar(name, fn) {
@@ -3900,6 +3911,7 @@ _extend(KToolbar, KWidget, {
 function _toolbar(options) {
 	return new KToolbar(options);
 }
+K.ToolbarClass = KToolbar;
 K.toolbar = _toolbar;
 function KMenu(options) {
 	this.init(options);
@@ -3980,6 +3992,7 @@ _extend(KMenu, KWidget, {
 function _menu(options) {
 	return new KMenu(options);
 }
+K.MenuClass = KMenu;
 K.menu = _menu;
 function KColorPicker(options) {
 	this.init(options);
@@ -4054,6 +4067,7 @@ _extend(KColorPicker, KWidget, {
 function _colorpicker(options) {
 	return new KColorPicker(options);
 }
+K.ColorPickerClass = KColorPicker;
 K.colorpicker = _colorpicker;
 function KUploadButton(options) {
 	this.init(options);
@@ -4142,6 +4156,7 @@ _extend(KUploadButton, {
 function _uploadbutton(options) {
 	return new KUploadButton(options);
 }
+K.UploadButtonClass = KUploadButton;
 K.uploadbutton = _uploadbutton;
 function _createButton(arg) {
 	arg = arg || {};
@@ -4275,6 +4290,7 @@ _extend(KDialog, KWidget, {
 function _dialog(options) {
 	return new KDialog(options);
 }
+K.DialogClass = KDialog;
 K.dialog = _dialog;
 function _tabs(options) {
 	var self = _widget(options),
@@ -4568,6 +4584,9 @@ function _bindNewlineEvent() {
 		if (newlineTag == 'br') {
 			return;
 		}
+		if (_GECKO) {
+			return;
+		}
 		self.cmd.selection();
 		var tagName = getAncestorTagName(self.cmd.range);
 		if (tagName == 'marquee' || tagName == 'select') {
@@ -5117,12 +5136,12 @@ KEditor.prototype = {
 		}
 		return self;
 	},
-	insertHtml : function(val) {
+	insertHtml : function(val, quickMode) {
 		if (!this.isCreated) {
 			return this;
 		}
 		val = this.beforeSetHtml(val);
-		this.exec('inserthtml', val);
+		this.exec('inserthtml', val, quickMode);
 		return this;
 	},
 	appendHtml : function(val) {
@@ -5314,7 +5333,7 @@ function _create(expr, options) {
 		return editor.create();
 	}
 	var knode = K(expr);
-	if (!knode) {
+	if (!knode || knode.length === 0) {
 		return;
 	}
 	if (knode.length > 1) {
@@ -5334,6 +5353,27 @@ function _create(expr, options) {
 	});
 	return editor;
 }
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j, editor);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
 if (_IE && _V < 7) {
 	_nativeCommand(document, 'BackgroundImageCache', true);
 }

data/vendor/assets/javascripts/kindeditor/plugins/flash/flash.js

@@ -13,6 +13,7 @@ KindEditor.plugin('flash', function(K) {
 		allowFileManager = K.undef(self.allowFileManager, false),
 		formatUploadUrl = K.undef(self.formatUploadUrl, true),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
 	self.plugin.flash = {
 		edit : function() {
@@ -86,7 +87,7 @@ KindEditor.plugin('flash', function(K) {
 			if (allowFlashUpload) {
 				var uploadbutton = K.uploadbutton({
 					button : K('.ke-upload-button', div)[0],
-					fieldName : 'imgFile',
+					fieldName : filePostName,
 					extraParams : extraParams,
 					url : K.addParam(uploadJson, 'dir=flash'),
 					afterUpload : function(data) {
@@ -98,7 +99,7 @@ KindEditor.plugin('flash', function(K) {
 							}
 							urlBox.val(url);
 							if (self.afterUpload) {
-								self.afterUpload.call(self, url);
+								self.afterUpload.call(self, url, data, name);
 							}
 							alert(self.lang('uploadSuccess'));
 						} else {
@@ -127,6 +128,9 @@ KindEditor.plugin('flash', function(K) {
 							clickFn : function(url, title) {
 								if (self.dialogs.length > 1) {
 									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
 									self.hideDialog();
 								}
 							}

data/vendor/assets/javascripts/kindeditor/plugins/image/image.js

@@ -16,6 +16,8 @@ KindEditor.plugin('image', function(K) {
 		imageTabIndex = K.undef(self.imageTabIndex, 0),
 		imgPath = self.pluginsPath + 'image/images/',
 		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
 		lang = self.lang(name + '.');
 
 	self.plugin.imageDialog = function(options) {
@@ -24,6 +26,8 @@ KindEditor.plugin('image', function(K) {
 			imageHeight = K.undef(options.imageHeight, ''),
 			imageTitle = K.undef(options.imageTitle, ''),
 			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
 			tabIndex = K.undef(options.tabIndex, 0),
 			clickFn = options.clickFn;
 		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
@@ -82,8 +86,8 @@ KindEditor.plugin('image', function(K) {
 			//local upload - end
 			'</div>'
 		].join('');
-		var dialogWidth = allowImageUpload ? 450 : 400,
-			dialogHeight = allowImageUpload ? 300 : 250;
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
 		var dialog = self.createDialog({
 			name : name,
 			width : dialogWidth,
@@ -98,7 +102,7 @@ KindEditor.plugin('image', function(K) {
 						return;
 					}
 					// insert local image
-					if (tabs && tabs.selectedIndex === 1) {
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
 						if (uploadbutton.fileBox.val() == '') {
 							alert(self.lang('pleaseSelectFile'));
 							return;
@@ -157,7 +161,7 @@ KindEditor.plugin('image', function(K) {
 			alignBox = K('.tab1 [name="align"]', div);
 
 		var tabs;
-		if (allowImageUpload) {
+		if (showRemote && showLocal) {
 			tabs = K.tabs({
 				src : K('.tabs', div),
 				afterSelect : function(i) {}
@@ -171,13 +175,15 @@ KindEditor.plugin('image', function(K) {
 				panel : K('.tab2', div)
 			});
 			tabs.select(tabIndex);
-		} else {
+		} else if (showRemote) {
 			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
 		}
 
 		var uploadbutton = K.uploadbutton({
 			button : K('.ke-upload-button', div)[0],
-			fieldName : 'imgFile',
+			fieldName : filePostName,
 			url : K.addParam(uploadJson, 'dir=image'),
 			form : K('.ke-form', div),
 			target : target,
@@ -189,9 +195,15 @@ KindEditor.plugin('image', function(K) {
 					if (formatUploadUrl) {
 						url = K.formatUrl(url, 'absolute');
 					}
-					clickFn.call(self, url, '', '', '', 0, '');
 					if (self.afterUpload) {
-						self.afterUpload.call(self, url);
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
 					}
 				} else {
 					alert(data.message);
@@ -214,6 +226,9 @@ KindEditor.plugin('image', function(K) {
 						clickFn : function(url, title) {
 							if (self.dialogs.length > 1) {
 								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
 								self.hideDialog();
 							}
 						}
@@ -277,6 +292,8 @@ KindEditor.plugin('image', function(K) {
 				imageHeight : img ? img.height() : '',
 				imageTitle : img ? img.attr('title') : '',
 				imageAlign : img ? img.attr('align') : '',
+				showRemote : true,
+				showLocal : allowImageUpload,
 				tabIndex: img ? 0 : imageTabIndex,
 				clickFn : function(url, title, width, height, border, align) {
 					self.exec('insertimage', url, title, width, height, border, align);

data/vendor/assets/javascripts/kindeditor/plugins/insertfile/insertfile.js

@@ -14,6 +14,7 @@ KindEditor.plugin('insertfile', function(K) {
 		formatUploadUrl = K.undef(self.formatUploadUrl, true),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
 		lang = self.lang(name + '.');
 	self.plugin.fileDialog = function(options) {
 		var fileUrl = K.undef(options.fileUrl, 'http://'),
@@ -69,7 +70,7 @@ KindEditor.plugin('insertfile', function(K) {
 		if (allowFileUpload) {
 			var uploadbutton = K.uploadbutton({
 				button : K('.ke-upload-button', div)[0],
-				fieldName : 'imgFile',
+				fieldName : filePostName,
 				url : K.addParam(uploadJson, 'dir=file'),
 				extraParams : extraParams,
 				afterUpload : function(data) {
@@ -81,7 +82,7 @@ KindEditor.plugin('insertfile', function(K) {
 						}
 						urlBox.val(url);
 						if (self.afterUpload) {
-							self.afterUpload.call(self, url);
+							self.afterUpload.call(self, url, data, name);
 						}
 						alert(self.lang('uploadSuccess'));
 					} else {
@@ -109,6 +110,9 @@ KindEditor.plugin('insertfile', function(K) {
 						clickFn : function(url, title) {
 							if (self.dialogs.length > 1) {
 								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
 								self.hideDialog();
 							}
 						}

data/vendor/assets/javascripts/kindeditor/plugins/media/media.js

@@ -13,6 +13,7 @@ KindEditor.plugin('media', function(K) {
 		allowFileManager = K.undef(self.allowFileManager, false),
 		formatUploadUrl = K.undef(self.formatUploadUrl, true),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
 	self.plugin.media = {
 		edit : function() {
@@ -94,7 +95,7 @@ KindEditor.plugin('media', function(K) {
 			if (allowMediaUpload) {
 				var uploadbutton = K.uploadbutton({
 					button : K('.ke-upload-button', div)[0],
-					fieldName : 'imgFile',
+					fieldName : filePostName,
 					extraParams : extraParams,
 					url : K.addParam(uploadJson, 'dir=media'),
 					afterUpload : function(data) {
@@ -106,7 +107,7 @@ KindEditor.plugin('media', function(K) {
 							}
 							urlBox.val(url);
 							if (self.afterUpload) {
-								self.afterUpload.call(self, url);
+								self.afterUpload.call(self, url, data, name);
 							}
 							alert(self.lang('uploadSuccess'));
 						} else {
@@ -135,6 +136,9 @@ KindEditor.plugin('media', function(K) {
 							clickFn : function(url, title) {
 								if (self.dialogs.length > 1) {
 									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
 									self.hideDialog();
 								}
 							}

data/vendor/assets/javascripts/kindeditor/plugins/multiimage/multiimage.js

@@ -57,6 +57,7 @@ K.extend(KSWFUpload, {
 			file_types_description : options.fileTypesDesc,
 			file_upload_limit : options.fileUploadLimit,
 			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
 			file_queued_handler : function(file) {
 				file.url = self.options.fileIconUrl;
 				self.appendFile(file);
@@ -113,7 +114,7 @@ K.extend(KSWFUpload, {
 					return;
 				}
 				file.url = data.url;
-				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus);
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
 				K('.ke-status > div', itemDiv).hide();
 			}
 		};
@@ -127,10 +128,9 @@ K.extend(KSWFUpload, {
 		var list = [];
 		K('.ke-img', self.bodyDiv).each(function() {
 			var img = K(this);
-			var url = img.attr('src');
 			var status = img.attr('data-status');
 			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
-				list.push(url);
+				list.push(img.data('data'));
 			}
 		});
 		return list;
@@ -203,6 +203,7 @@ KindEditor.plugin('multiimage', function(K) {
 		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
 		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
 		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
 		lang = self.lang(name + '.');
 
 	self.plugin.multiImageDialog = function(options) {
@@ -248,11 +249,12 @@ KindEditor.plugin('multiimage', function(K) {
 			startButtonValue : lang.startUpload,
 			uploadUrl : K.addParam(uploadJson, 'dir=image'),
 			flashUrl : imgPath + 'swfupload.swf',
-			filePostName : 'imgFile',
+			filePostName : filePostName,
 			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
 			fileTypesDesc : 'Image Files',
 			fileUploadLimit : imageUploadLimit,
 			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
 			queueLimitExceeded : lang.queueLimitExceeded,
 			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
 			zeroByteFile : lang.zeroByteFile,
@@ -273,11 +275,12 @@ KindEditor.plugin('multiimage', function(K) {
 				if (urlList.length === 0) {
 					return;
 				}
-				var html = '';
-				K.each(urlList, function(i, url) {
-					html += '<img src="' + K.escape(url) + '" data-ke-src="' + K.escape(url) + '" alt="" /><br />';
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
 				});
-				self.insertHtml(html);
 				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
 				setTimeout(function() {
 					self.hideDialog().focus();
@@ -305,14 +308,17 @@ KindEditor.plugin('multiimage', function(K) {
 /* ******************* */
 /* Constructor & Init  */
 /* ******************* */
-var SWFUpload;
 
-if (SWFUpload == undefined) {
-	SWFUpload = function (settings) {
-		this.initSWFUpload(settings);
-	};
+(function() {
+
+if (window.SWFUpload) {
+	return;
 }
 
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
 SWFUpload.prototype.initSWFUpload = function (settings) {
 	try {
 		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
@@ -1366,3 +1372,5 @@ if (typeof(SWFUpload) === "function") {
 		}
 	};
 }
+
+})();

data/vendor/assets/javascripts/kindeditor/plugins/table/table.js

@@ -494,6 +494,9 @@ KindEditor.plugin('table', function(K) {
 				row = self.plugin.getSelectedRow()[0],
 				cell = self.plugin.getSelectedCell()[0],
 				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
 			for (var i = 0, len = table.rows.length; i < len; i++) {
 				var newRow = table.rows[i],
 					newCell = newRow.insertCell(index);
@@ -514,14 +517,18 @@ KindEditor.plugin('table', function(K) {
 		rowinsert : function(offset) {
 			var table = self.plugin.getSelectedTable()[0],
 				row = self.plugin.getSelectedRow()[0],
-				cell = self.plugin.getSelectedCell()[0],
-				newRow;
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
 			if (offset === 1) {
-				newRow = table.insertRow(row.rowIndex + (cell.rowSpan - 1) + offset);
-			} else {
-				newRow = table.insertRow(row.rowIndex);
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
 			}
+			var newRow = table.insertRow(rowIndex);
+
 			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
 				var newCell = newRow.insertCell(i);
 				// copy colspan
 				if (offset === 1 && row.cells[i].colSpan > 1) {
@@ -529,6 +536,18 @@ KindEditor.plugin('table', function(K) {
 				}
 				newCell.innerHTML = K.IE ? '' : '<br />';
 			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
 			self.cmd.range.selectNodeContents(cell).collapse(true);
 			self.cmd.select();
 			self.addBookmark();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave