rails_kindeditor 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9953e89ceb6b66c193776ef01b8dfbd0f96b7521
-  data.tar.gz: cca4bd72c30501d0b6fd2f99357023f8239a7714
+  metadata.gz: 66f2473afc715a6acb5b4d9d409d8e1e954f074f
+  data.tar.gz: db64a6dc2c6fc7d9168c5ce6e0874983653772f3
 SHA512:
-  metadata.gz: 411bc9ddf64d32f25478211de00c255a88ed68a9420337fb4b1a1d0e680b0b9334d42b5ea27e99ce9d8321650724e5cfbcdb6a2d6c5fcbf6d5dd08a4a4d26cea
-  data.tar.gz: a146bc706d32f11e653228cb20e826ff2c74ebb95355ed17a9b0fdd6a1913481a553195ae6fc5df923457e1e04f350cf6248e5a02ac8f65d6e0f3523b3a6fabf
+  metadata.gz: 14bbd52ce96ba95977fb855182b1aa07c0c66a4737389ea22cf94ad8fcefed5eac8df8dca08828832a0f344b8cf1ae48262ac54fa38375a19110d23c1c216ebf
+  data.tar.gz: 1989a75fef926c16fb4451d0e23d0dea67adb57cd2d96f0d1f18b637e811ce367126c63958f1ee11ede7373134901703af5a82e39b0da3e5555e9383b7aee661

data/README.md

@@ -1,4 +1,4 @@
-# Kindeditor for Ruby on Rails
+# Kindeditor for Ruby on Rails  [![Gem Version](https://badge.fury.io/rb/rails_kindeditor.png)](http://badge.fury.io/rb/rails_kindeditor)
 
 Kindeditor is a WYSIWYG javascript editor, visit http://www.kindsoft.net for details.
 rails_kindeditor will helps your rails app integrate with kindeditor, includes images and files uploading.
@@ -10,7 +10,7 @@ rails_kindeditor will helps your rails app integrate with kindeditor, includes i
 ### Add this to your Gemfile
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.4.2'
+  gem 'rails_kindeditor'
 ```
 
 ### Run "bundle" command.
@@ -261,7 +261,7 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
 ### 将下面代码加入Gemfile：
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.4.2'
+  gem 'rails_kindeditor'
 ```
 
 ### 运行"bundle"命令：

data/lib/rails_kindeditor/helper.rb

@@ -35,8 +35,13 @@ module RailsKindeditor
     def js_replace(dom_id, options = {})
       editor_id = options[:editor_id].nil? ? '' : "#{options[:editor_id].to_s.downcase} = "
       if options[:window_onload]
-        "window.onload = function() {
+        require 'SecureRandom'
+        random_name = SecureRandom.hex;
+        "var old_onload_#{random_name};
+        if(typeof window.onload == 'function') old_onload_#{random_name} = window.onload;
+        window.onload = function() {
           #{editor_id}KindEditor.create('##{dom_id}', #{get_options(options).to_json});
+          if(old_onload_#{random_name}) old_onload_#{random_name}();
         }"
       else
         "KindEditor.ready(function(K){

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 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.9 (2013-10-08)
+* @version 4.1.10 (2013-11-23)
 *******************************************************************************/
 (function (window, undefined) {
 	if (window.KindEditor) {
@@ -17,9 +17,10 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.9 (2013-10-08)',
+var _VERSION = '4.1.10 (2013-11-23)',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
 	_WEBKIT = _ua.indexOf('applewebkit') > -1,
 	_OPERA = _ua.indexOf('opera') > -1,
@@ -213,23 +214,19 @@ var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,c
 	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
 	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
 	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
-
 // Begining of modification by Macrow
 function _getBasePath() {
+	var refPath = '/assets/kindeditor/';
 	var els = document.getElementsByTagName('script'), src;
 	for (var i = 0, len = els.length; i < len; i++) {
 		src = els[i].src || '';
-		if (/kindeditor[\w\-\.]*\.js/.test(src)) { // in development mode
-			return src.substring(0, src.lastIndexOf('/') + 1);
-		}
-		if (/application[\w\-\.]*\.js/.test(src)) { // in production mode, we need application.js.
-			return src.substring(0, src.lastIndexOf('/') + 1) + 'kindeditor/';
+		if (/(kindeditor|application)[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.indexOf('assets')) + refPath;
 		}
 	}
-	return '/assets/kindeditor/';
+	return refPath;
 }
 // End of modification by Macrow
-
 K.basePath = _getBasePath();
 K.options = {
 	designMode : true,
@@ -405,15 +402,17 @@ _extend(KEvent, {
 		var ev = this.event;
 		if (ev.preventDefault) {
 			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
 		}
-		ev.returnValue = false;
 	},
 	stopPropagation : function() {
 		var ev = this.event;
 		if (ev.stopPropagation) {
 			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
 		}
-		ev.cancelBubble = true;
 	},
 	stop : function() {
 		this.preventDefault();
@@ -734,7 +733,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
 	html = html.replace(/\u200B/g, '');
 	html = html.replace(/\u00A9/g, '&copy;');
-	html = html.replace(/<[^>]+>/g, function($0) {
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
 		return $0.replace(/\s+/g, ' ');
 	});
 	var htmlTagMap = {};
@@ -1280,7 +1280,7 @@ function _docWidth(doc) {
 function _getScrollPos(doc) {
 	doc = doc || document;
 	var x, y;
-	if (_IE || _OPERA) {
+	if (_IE || _NEWIE || _OPERA) {
 		x = _docElement(doc).scrollLeft;
 		y = _docElement(doc).scrollTop;
 	} else {
@@ -3110,30 +3110,19 @@ _extend(KCmd, {
 		});
 	},
 	forecolor : function(val) {
-		return this.toggle('<span style="color:' + val + ';"></span>', {
-			span : '.color=' + val,
-			font : 'color'
-		});
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
 	},
 	hilitecolor : function(val) {
-		return this.toggle('<span style="background-color:' + val + ';"></span>', {
-			span : '.background-color=' + val
-		});
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
 	},
 	fontsize : function(val) {
-		return this.toggle('<span style="font-size:' + val + ';"></span>', {
-			span : '.font-size=' + val,
-			font : 'size'
-		});
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
 	},
 	fontname : function(val) {
 		return this.fontfamily(val);
 	},
 	fontfamily : function(val) {
-		return this.toggle('<span style="font-family:' + val + ';"></span>', {
-			span : '.font-family=' + val,
-			font : 'face'
-		});
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
 	},
 	removeformat : function() {
 		var map = {
@@ -3731,12 +3720,16 @@ _extend(KEdit, KWidget, {
 		!isDocumentDomain && ready();
 	},
 	setWidth : function(val) {
-		this.div.css('width', _addUnit(val));
-		return this;
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
 	},
 	setHeight : function(val) {
 		var self = this;
 		val = _addUnit(val);
+		self.height = val;
 		self.div.css('height', val);
 		self.iframe.css('height', val);
 		if ((_IE && _V < 8) || _QUIRKS) {
@@ -4182,6 +4175,8 @@ _extend(KUploadButton, {
 		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
 		self.form = options.form ? K(options.form) : K('form', div);
 		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
 		self.options = options;
 	},
 	submit : function() {

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

@@ -14,31 +14,41 @@ KindEditor.plugin('autoheight', function(K) {
 		return;
 	}
 
-	var edit = self.edit;
-	var body = edit.doc.body;
-	var minHeight = K.removeUnit(self.height);
+	var minHeight;
 
-	edit.iframe[0].scroll = 'no';
-	body.style.overflowY = 'hidden';
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
 
 	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
 		edit.iframe.height(minHeight);
 		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
 	}
 
-	/*
-	* 如何实现真正的自动高度？
-	* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
-	* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
-	* 由此就实现了真正的自动高度
-	* 测试：chrome、firefox、IE9、IE8
-	* */
+	function init() {
+		minHeight = K.removeUnit(self.height);
 
-	edit.afterChange(resetHeight);
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
 
 	if (self.isCreated) {
-		resetHeight();
+		init();
 	} else {
-		self.afterCreate(resetHeight);
+		self.afterCreate(init);
 	}
 });
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */

data/vendor/assets/javascripts/kindeditor/themes/default/default.css

@@ -862,6 +862,7 @@
 	overflow: hidden;
 	margin: 0;
 	padding: 0;
+	*height: 25px;
 }
 .ke-upload-area .ke-upload-file {
 	position: absolute;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Macrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave