rails_kindeditor 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f55735781f4a21a72d13431378b822de72b0a0
-  data.tar.gz: a0f0ba28aade0c9ecb1368b0e9dc4791158cc4cb
+  metadata.gz: 9b6cfb7130f199515719e293a4c199691661712a
+  data.tar.gz: 15881a605cca4945a17d87f11739bf6d8f513980
 SHA512:
-  metadata.gz: e2f21d45a23f0d912b1263d70c697305e617a407d7db698961fc1ff8f2604baf14a1f86aba7972598ae2a69da85a873469e01df57d4dd20c51b994e46efb731e
-  data.tar.gz: 6c1b0a19dd78a0380960044c2d9429cc6b88c6b091c179684fc24f0e0a83ee18ea48d64b5516fdac28a760884f1babce7d7d3b4da5dda0eef2d44cd6ce3f6c3b
+  metadata.gz: 1a71b336bcb4280a0b2edab79132834fdfb7a7889150a1dd533d922e71fdb62fc2aed35251f96fb6c6338d2183ced82a96971722f5259797c4683144c9929ffd
+  data.tar.gz: c3dd5813fe30b5d2fdff83bd50dfd9c60567776ab49f872dba6c7ee66bcf4b4660788520ee388f0d6bf21b2e7660117c10692861720dc54793069d8ed2a75892

data/README.md

@@ -13,7 +13,7 @@ Deprecation: rails_kindeditor ~> v0.3.0 only support Rails3.1+!(include Rails3.1
 ### Add this to your Gemfile
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.3.14'
+  gem 'rails_kindeditor', '~> 0.3.15'
 ```
 
 ### Run "bundle" command.
@@ -169,7 +169,7 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
 ### 将下面代码加入Gemfile：
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.3.11'
+  gem 'rails_kindeditor', '~> 0.3.15'
 ```
 
 ### 运行"bundle"命令：

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 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.6 (2013-03-24)
+* @version 4.1.7 (2013-04-21)
 *******************************************************************************/
 (function (window, undefined) {
 	if (window.KindEditor) {
@@ -17,7 +17,7 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.6 (2013-03-24)',
+var _VERSION = '4.1.7 (2013-04-21)',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
@@ -5016,12 +5016,10 @@ KEditor.prototype = {
 		statusbar.removeClass('statusbar').addClass('ke-statusbar')
 			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
 			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
-		function fullscreenResizeHandler(e) {
-			if (self.isCreated) {
-				self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
-			}
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
 		}
-		K(window).unbind('resize', fullscreenResizeHandler);
 		function initResize() {
 			if (statusbar.height() === 0) {
 				setTimeout(initResize, 100);
@@ -5031,7 +5029,12 @@ KEditor.prototype = {
 		}
 		initResize();
 		if (fullscreenMode) {
-			K(window).bind('resize', fullscreenResizeHandler);
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
 			toolbar.select('fullscreen');
 			statusbar.first().css('visibility', 'hidden');
 			statusbar.last().css('visibility', 'hidden');
@@ -5476,6 +5479,7 @@ _plugin('core', function(K) {
 			self.toolbar.disableAll(false);
 			self.edit.design(true);
 			self.toolbar.unselect('source');
+			self.cmd.selection();
 		}
 		self.designMode = self.edit.designMode;
 	});
@@ -5794,6 +5798,12 @@ _plugin('core', function(K) {
 			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
 				return unescape(tag);
 			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
 		}
 		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
 			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;

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

@@ -153,6 +153,8 @@ KindEditor.plugin('flash', function(K) {
 		},
 		'delete' : function() {
 			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
 		}
 	};
 	self.clickToolbar(name, self.plugin.flash.edit);

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

@@ -310,6 +310,8 @@ KindEditor.plugin('image', function(K) {
 				target = target.parent();
 			}
 			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
 		}
 	};
 	self.clickToolbar(name, self.plugin.image.edit);

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

@@ -162,6 +162,8 @@ KindEditor.plugin('media', function(K) {
 		},
 		'delete' : function() {
 			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
 		}
 	};
 	self.clickToolbar(name, self.plugin.media.edit);

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

@@ -569,7 +569,7 @@ KindEditor.plugin('table', function(K) {
 			if (table.rows.length <= nextRowIndex) {
 				return;
 			}
-			var cellIndex = _getCellIndex(table, row, cell); // 下一行单元格的index
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
 			if (nextRow.cells.length <= cellIndex) {
 				return;
 			}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Macrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave