rails_kindeditor 0.2.7 → 0.2.8

data/lib/generators/rails_kindeditor/install/templates/kindeditor/plugins/image/image.js

@@ -12,15 +12,17 @@ KindEditor.plugin('image', function(K) {
 		allowImageUpload = K.undef(self.allowImageUpload, true),
 		allowFileManager = K.undef(self.allowFileManager, false),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
-		imgPath = self.basePath + 'plugins/image/images/',
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
 		lang = self.lang(name + '.');
 
 	self.plugin.imageDialog = function(options) {
-		var imageUrl = K.undef(options.imageUrl, 'http://'),
+		var imageUrl = options.imageUrl,
 			imageWidth = K.undef(options.imageWidth, ''),
 			imageHeight = K.undef(options.imageHeight, ''),
 			imageTitle = K.undef(options.imageTitle, ''),
 			imageAlign = K.undef(options.imageAlign, ''),
+			tabIndex = K.undef(options.tabIndex, 0),
 			clickFn = options.clickFn;
 		var html = [
 			'<div style="padding:10px 20px;">',
@@ -46,7 +48,7 @@ KindEditor.plugin('image', function(K) {
 			'<label for="keWidth" style="width:60px;">' + lang.size + '</label>',
 			lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
 			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
-			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.gif" width="16" height="16" alt="" style="cursor:pointer;" />',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
 			'</div>',
 			//align
 			'<div class="ke-dialog-row">',
@@ -75,6 +77,10 @@ KindEditor.plugin('image', function(K) {
 				click : function(e) {
 					// insert local image
 					if (tabs && tabs.selectedIndex === 1) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
 						dialog.showLoading(self.lang('uploadLoading'));
 						uploadbutton.submit();
 						localUrlBox.val('');
@@ -111,11 +117,11 @@ KindEditor.plugin('image', function(K) {
 				}
 			},
 			beforeRemove : function() {
-				viewServerBtn.remove();
-				widthBox.remove();
-				heightBox.remove();
-				refreshBtn.remove();
-				uploadbutton.remove();
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+				//uploadbutton.remove();
 			}
 		}),
 		div = dialog.div;
@@ -123,10 +129,7 @@ KindEditor.plugin('image', function(K) {
 		var tabs;
 		if (allowImageUpload) {
 			tabs = K.tabs({
-				src : K('.tabs', div),
-				afterSelect : function(i) {
-			
-				}
+				src : K('.tabs', div)
 			});
 			tabs.add({
 				title : lang.remoteImage,
@@ -136,7 +139,7 @@ KindEditor.plugin('image', function(K) {
 				title : lang.localImage,
 				panel : K('.tab2', div)
 			});
-			tabs.select(0);
+			tabs.select(tabIndex);
 		} else {
 			K('.tab1', div).show();
 		}
@@ -154,6 +157,7 @@ KindEditor.plugin('image', function(K) {
 			button : K('.ke-upload-button', div)[0],
 			fieldName : 'imgFile',
 			url : K.addParam(uploadJson, 'dir=image'),
+			width: 60,
 			afterUpload : function(data) {
 				dialog.hideLoading();
 				if (data.error === 0) {
@@ -211,14 +215,16 @@ KindEditor.plugin('image', function(K) {
 		}
 		refreshBtn.click(function(e) {
 			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
-					position : 'absolute',
-					visibility : 'hidden',
-					top : 0,
-					left : '-1000px'
-				});
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
 			K(document.body).append(tempImg);
-			setSize(tempImg.width(), tempImg.height());
-			tempImg.remove();
 		});
 		widthBox.change(function(e) {
 			if (originalWidth > 0) {
@@ -239,8 +245,10 @@ KindEditor.plugin('image', function(K) {
 				return false;
 			}
 		});
-		urlBox[0].focus();
-		urlBox[0].select();
+		if (tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
 		return dialog;
 	};
 	self.plugin.image = {
@@ -252,6 +260,7 @@ KindEditor.plugin('image', function(K) {
 				imageHeight : img ? img.height() : '',
 				imageTitle : img ? img.attr('title') : '',
 				imageAlign : img ? img.attr('align') : '',
+				tabIndex: img ? 0 : imageTabIndex,
 				clickFn : function(url, title, width, height, border, align) {
 					self.exec('insertimage', url, title, width, height, border, align);
 					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog

data/lib/generators/rails_kindeditor/install/templates/kindeditor/plugins/insertfile/insertfile.js

@@ -9,6 +9,7 @@
 
 KindEditor.plugin('insertfile', function(K) {
 	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
 		allowFileManager = K.undef(self.allowFileManager, false),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
 		lang = self.lang(name + '.');
@@ -57,10 +58,6 @@ KindEditor.plugin('insertfile', function(K) {
 					}
 					clickFn.call(self, url, title);
 				}
-			},
-			beforeRemove : function() {
-				viewServerBtn.remove();
-				uploadbutton.remove();
 			}
 		}),
 		div = dialog.div;
@@ -69,32 +66,37 @@ KindEditor.plugin('insertfile', function(K) {
 			viewServerBtn = K('[name="viewServer"]', div),
 			titleBox = K('[name="title"]', div);
 
-		var uploadbutton = K.uploadbutton({
-			button : K('.ke-upload-button', div)[0],
-			fieldName : 'imgFile',
-			url : K.addParam(uploadJson, 'dir=file'),
-			afterUpload : function(data) {
-				dialog.hideLoading();
-				if (data.error === 0) {
-					var url = K.formatUrl(data.url, 'absolute');
-					urlBox.val(url);
-					if (self.afterUpload) {
-						self.afterUpload.call(self, url);
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : 'imgFile',
+				url : K.addParam(uploadJson, 'dir=file'),
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = K.formatUrl(data.url, 'absolute');
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
 					}
-					alert(self.lang('uploadSuccess'));
-				} else {
-					alert(data.message);
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
 				}
-			},
-			afterError : function(html) {
-				dialog.hideLoading();
-				self.errorDialog(html);
-			}
-		});
-		uploadbutton.fileBox.change(function(e) {
-			dialog.showLoading(self.lang('uploadLoading'));
-			uploadbutton.submit();
-		});
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+			urlBox.width(250);
+		}
 		if (allowFileManager) {
 			viewServerBtn.click(function(e) {
 				self.loadPlugin('filemanager', function() {

data/lib/generators/rails_kindeditor/install/templates/kindeditor/plugins/quickformat/quickformat.js

@@ -10,6 +10,13 @@
 KindEditor.plugin('quickformat', function(K) {
 	var self = this, name = 'quickformat',
 		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
 	self.clickToolbar(name, function() {
 		self.focus();
 		var doc = self.edit.doc,
@@ -19,17 +26,20 @@ KindEditor.plugin('quickformat', function(K) {
 			bookmark = range.createBookmark(true);
 		while(child) {
 			next = child.next();
-			if (blockMap[child.name]) {
-				child.html(child.html().replace(/^(\s| |　)+/ig, ''));
-				child.css('text-indent', '2em');
-			} else {
-				subList.push(child);
-			}
-			if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
-				if (subList.length > 0) {
-					nodeList.push(subList);
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s| |　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
 				}
-				subList = [];
 			}
 			child = next;
 		}

data/lib/generators/rails_kindeditor/install/templates/kindeditor/plugins/table/table.js

@@ -9,6 +9,49 @@
 
 KindEditor.plugin('table', function(K) {
 	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
 	// 取得下一行cell的index
 	function _getCellIndex(table, row, cell) {
 		var rowSpanCount = 0;
@@ -74,23 +117,13 @@ KindEditor.plugin('table', function(K) {
 				'</div>',
 				'</div>'
 			].join('');
-			var picker, currentElement;
-			function removePicker() {
-				if (picker) {
-					picker.remove();
-					picker = null;
-					currentElement = null;
-				}
-			}
 			var dialog = self.createDialog({
 				name : name,
 				width : 500,
 				height : 300,
 				title : self.lang(name),
 				body : html,
-				beforeDrag : removePicker,
 				beforeRemove : function() {
-					removePicker();
 					colorBox.unbind();
 				},
 				yesBtn : {
@@ -261,36 +294,10 @@ KindEditor.plugin('table', function(K) {
 			alignBox = K('[name="align"]', div),
 			borderBox = K('[name="border"]', div).val(1),
 			colorBox = K('.ke-input-color', div);
-			function setColor(box, color) {
-				color = color.toUpperCase();
-				box.css('background-color', color);
-				box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
-				box.html(color);
-			}
-			setColor(K(colorBox[0]), '#000000');
-			setColor(K(colorBox[1]), '');
-			function clickHandler(e) {
-				removePicker();
-				if (!picker || this !== currentElement) {
-					var box = K(this),
-						pos = box.pos();
-					picker = K.colorpicker({
-						x : pos.x,
-						y : pos.y + box.height(),
-						z : 811214,
-						selectedColor : K(this).html(),
-						colors : self.colorTable,
-						noColor : self.lang('noColor'),
-						shadowMode : self.shadowMode,
-						click : function(color) {
-							setColor(box, color);
-							removePicker();
-						}
-					});
-					currentElement = this;
-				}
-			}
-			colorBox.click(clickHandler);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
 			// foucs and select
 			rowsBox[0].focus();
 			rowsBox[0].select();
@@ -322,8 +329,8 @@ KindEditor.plugin('table', function(K) {
 				spacingBox.val(table[0].cellSpacing || '');
 				alignBox.val(table[0].align || '');
 				borderBox.val(table[0].border === undefined ? '' : table[0].border);
-				setColor(K(colorBox[0]), K.toHex(table.attr('borderColor') || ''));
-				setColor(K(colorBox[1]), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
 				widthBox[0].focus();
 				widthBox[0].select();
 			}
@@ -376,23 +383,13 @@ KindEditor.plugin('table', function(K) {
 				'</div>',
 				'</div>'
 			].join('');
-			var picker, currentElement;
-			function removePicker() {
-				if (picker) {
-					picker.remove();
-					picker = null;
-					currentElement = null;
-				}
-			}
 			var dialog = self.createDialog({
 				name : name,
 				width : 500,
 				height : 220,
 				title : self.lang('tablecell'),
 				body : html,
-				beforeDrag : removePicker,
 				beforeRemove : function() {
-					removePicker();
 					colorBox.unbind();
 				},
 				yesBtn : {
@@ -450,36 +447,10 @@ KindEditor.plugin('table', function(K) {
 			verticalAlignBox = K('[name="verticalAlign"]', div),
 			borderBox = K('[name="border"]', div).val(1),
 			colorBox = K('.ke-input-color', div);
-			function setColor(box, color) {
-				color = color.toUpperCase();
-				box.css('background-color', color);
-				box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
-				box.html(color);
-			}
-			setColor(K(colorBox[0]), '#000000');
-			setColor(K(colorBox[1]), '');
-			function clickHandler(e) {
-				removePicker();
-				if (!picker || this !== currentElement) {
-					var box = K(this),
-						pos = box.pos();
-					picker = K.colorpicker({
-						x : pos.x,
-						y : pos.y + box.height(),
-						z : 811214,
-						selectedColor : K(this).html(),
-						colors : self.colorTable,
-						noColor : self.lang('noColor'),
-						shadowMode : self.shadowMode,
-						click : function(color) {
-							setColor(box, color);
-							removePicker();
-						}
-					});
-					currentElement = this;
-				}
-			}
-			colorBox.click(clickHandler);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
 			// foucs and select
 			widthBox[0].focus();
 			widthBox[0].select();
@@ -505,8 +476,8 @@ KindEditor.plugin('table', function(K) {
 				border = parseInt(border);
 			}
 			borderBox.val(border);
-			setColor(K(colorBox[0]), K.toHex(cell[0].style.borderColor || ''));
-			setColor(K(colorBox[1]), K.toHex(cell[0].style.backgroundColor || ''));
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
 			widthBox[0].focus();
 			widthBox[0].select();
 		},