rails_kindeditor 0.3.6 → 0.3.7

data/lib/rails_kindeditor.rb

@@ -1,6 +1,5 @@
 require 'rails_kindeditor/engine'
 require 'rails_kindeditor/helper'
-require 'rails_kindeditor/controller_additions'
 require 'carrierwave'
 require 'mini_magick'
 

data/lib/rails_kindeditor/engine.rb

@@ -9,10 +9,6 @@ module RailsKindeditor
       app.config.assets.precompile += RailsKindeditor.assets
     end
     
-    initializer "rails_kindeditor.methods" do
-      ActionController::Base.send(:include, RailsKindeditor::ControllerAdditions)
-    end
-    
     initializer "rails_kindeditor.simple_form_and_formtastic" do
       require "rails_kindeditor/simple_form" if Object.const_defined?("SimpleForm")
       require "rails_kindeditor/formtastic" if Object.const_defined?("Formtastic")

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 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.2 (2012-07-21)
+* @version 4.1.3 (2012-10-14)
 *******************************************************************************/
 (function (window, undefined) {
 	if (window.KindEditor) {
@@ -17,7 +17,7 @@ if (!window.console) {
 if (!console.log) {
 	console.log = function () {};
 }
-var _VERSION = '4.1.2 (2012-07-21)',
+var _VERSION = '4.1.3 (2012-10-14)',
 	_ua = navigator.userAgent.toLowerCase(),
 	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
 	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
@@ -75,7 +75,7 @@ function _inString(val, str, delimiter) {
 }
 function _addUnit(val, unit) {
 	unit = unit || 'px';
-	return val && /^\d+$/.test(val) ? val + 'px' : val;
+	return val && /^\d+$/.test(val) ? val + unit : val;
 }
 function _removeUnit(val) {
 	var match;
@@ -270,37 +270,38 @@ K.options = {
 	],
 	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
 	htmlTags : {
-		font : ['color', 'size', 'face', '.background-color'],
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
 		span : [
-			'.color', '.background-color', '.font-size', '.font-family', '.background',
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
 			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
 		],
 		div : [
-			'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
 			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
 			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
 		],
 		table: [
-			'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
 			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
 			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
 			'.width', '.height', '.border-collapse'
 		],
 		'td,th': [
-			'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
 			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
 		],
-		a : ['href', 'target', 'name'],
-		embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
-		img : ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
-			'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
 			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
 		],
-		pre : ['class'],
-		hr : ['class', '.page-break-after'],
-		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : []
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
 	},
 	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
 };
@@ -3280,13 +3281,14 @@ function _drag(options) {
 	var docs = [document];
 	if (iframeFix) {
 		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
 			var doc;
 			try {
 				doc = _iframeDoc(this);
-				K(doc);
-			} catch(e) {
-				doc = null;
-			}
+			} catch(e) {}
 			if (doc) {
 				var pos = K(this).pos();
 				K(doc).data('pos-x', pos.x);
@@ -4826,6 +4828,10 @@ KEditor.prototype = {
 		if (self.isCreated) {
 			return self;
 		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
 		if (fullscreenMode) {
 			_docElement().style.overflow = 'hidden';
 		} else {
@@ -5044,6 +5050,7 @@ KEditor.prototype = {
 			return self;
 		}
 		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
 		if (self.menu) {
 			self.hideMenu();
 		}
@@ -5068,7 +5075,7 @@ KEditor.prototype = {
 				self.container.css('width', _addUnit(width));
 			}
 		}
-		if (height !== null) {
+		if (height !== null && self.toolbar.div && self.statusbar) {
 			height = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
 			if (height > 0 && _removeUnit(height) > self.minHeight) {
 				self.edit.setHeight(height);
@@ -5763,7 +5770,9 @@ _plugin('core', function(K) {
 			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
 		})
 		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
-			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, '$1' + src + '$2');
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + unescape(src) + $2;
+			});
 			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
 			return full;
 		})
@@ -5796,7 +5805,7 @@ _plugin('core', function(K) {
 			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
 				return full;
 			}
-			full = start + key + '="' + src + '"' + ' data-ke-src="' + src + '"' + end;
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + escape(src) + '"' + end;
 			return full;
 		})
 		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {

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

@@ -194,6 +194,7 @@ KindEditor.lang({
 	'map.search' : 'بحث',
 	'baidumap.address' : 'العنوان: ',
 	'baidumap.search' : 'بحث',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
 	'anchor.name' : 'إسم الرابط',
 	'formatblock.formatBlock' : {
 		h1 : 'عنوان 1',

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

@@ -193,6 +193,7 @@ KindEditor.lang({
 	'map.search' : 'Search',
 	'baidumap.address' : 'Address: ',
 	'baidumap.search' : 'Search',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
 	'anchor.name' : 'Anchor name',
 	'formatblock.formatBlock' : {
 		h1 : 'Heading 1',

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

@@ -195,6 +195,7 @@ KindEditor.lang({
 	'map.search' : '搜索',
 	'baidumap.address' : '地址: ',
 	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
 	'anchor.name' : '锚点名称',
 	'formatblock.formatBlock' : {
 		h1 : '标题 1',

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

@@ -193,6 +193,7 @@ KindEditor.lang({
 	'map.search' : '尋找',
 	'baidumap.address' : '住所: ',
 	'baidumap.search' : '尋找',
+	'baidumap.insertDynamicMap' : '插入動態地圖',
 	'anchor.name' : '錨點名稱',
 	'formatblock.formatBlock' : {
 		h1 : '標題 1',

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

@@ -11,19 +11,29 @@
 
 KindEditor.plugin('baidumap', function(K) {
 	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
 	self.clickToolbar(name, function() {
 		var html = ['<div style="padding:10px 20px;">',
-			'<div class="ke-dialog-row">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
 			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
 			'<span class="ke-button-common ke-button-outer">',
 			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
 			'</span>',
 			'</div>',
-			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
 			'</div>'].join('');
 		var dialog = self.createDialog({
 			name : name,
-			width : 600,
+			width : mapWidth + 42,
 			title : self.lang(name),
 			body : html,
 			yesBtn : {
@@ -33,14 +43,19 @@ KindEditor.plugin('baidumap', function(K) {
 					var centerObj = map.getCenter();
 					var center = centerObj.lng + ',' + centerObj.lat;
 					var zoom = map.getZoom();
-					var url = ['http://api.map.baidu.com/staticimage',
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/' : 'http://api.map.baidu.com/staticimage',
 						'?center=' + encodeURIComponent(center),
 						'&zoom=' + encodeURIComponent(zoom),
-						'&width=558',
-						'&height=360',
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
 						'&markers=' + encodeURIComponent(center),
 						'&markerStyles=' + encodeURIComponent('l,A')].join('');
-					self.exec('insertimage', url).hideDialog().focus();
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
 				}
 			},
 			beforeRemove : function() {
@@ -54,8 +69,9 @@ KindEditor.plugin('baidumap', function(K) {
 		var div = dialog.div,
 			addressBox = K('[name="address"]', div),
 			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
 			win, doc;
-		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:558px;height:360px;"></iframe>');
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
 		function ready() {
 			win = iframe[0].contentWindow;
 			doc = K.iframeDoc(iframe);

data/vendor/assets/javascripts/kindeditor/plugins/baidumap/index.html

@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="utf-8" />
+<meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具" />
+<meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图" />
+<title>百度地图API自定义地图</title>
+<!--引用百度地图API-->
+<style type="text/css">
+	html,body{margin:0;padding:0;}
+	.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+	.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+</head>
+
+<body onload="initMap();">
+  <!--百度地图容器-->
+  <div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+	function getParam(name) {
+		return location.href.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+	}
+	var centerParam = getParam('center');
+	var zoomParam = getParam('zoom');
+	var widthParam = getParam('width');
+	var heightParam = getParam('height');
+	var markersParam = getParam('markers');
+	var markerStylesParam = getParam('markerStyles');
+
+	//创建和初始化地图函数：
+	function initMap(){
+		// [FF]切换模式后报错
+		if (!window.BMap) {
+			return;
+		}
+		var dituContent = document.getElementById('dituContent');
+		dituContent.style.width = widthParam + 'px';
+		dituContent.style.height = heightParam + 'px';
+
+		createMap();//创建地图
+		setMapEvent();//设置地图事件
+		addMapControl();//向地图添加控件
+
+		// 创建标注
+		var markersArr = markersParam.split(',');
+		var point = new BMap.Point(markersArr[0], markersArr[1]);
+		var marker = new BMap.Marker(point);
+		map.addOverlay(marker); // 将标注添加到地图中
+	}
+
+	//创建地图函数：
+	function createMap(){
+		var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+		var centerArr = centerParam.split(',');
+		var point = new BMap.Point(centerArr[0], centerArr[1]);//定义一个中心点坐标
+		map.centerAndZoom(point, zoomParam);//设定地图的中心点和坐标并将地图显示在地图容器中
+		window.map = map;//将map变量存储在全局
+	}
+
+	//地图事件设置函数：
+	function setMapEvent(){
+		map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+		map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+		map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+		map.enableKeyboard();//启用键盘上下左右键移动地图
+	}
+
+	//地图控件添加函数：
+	function addMapControl(){
+		//向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
+	map.addControl(ctrl_nav);
+		//向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
+	map.addControl(ctrl_ove);
+		//向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+	}
+</script>
+</html>

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

@@ -63,7 +63,7 @@ KindEditor.plugin('emoticons', function(K) {
 			parentDiv.append(table);
 			if (previewDiv) {
 				K(table).mouseover(function() {
-					previewDiv.show();
+					previewDiv.show('block');
 				});
 				K(table).mouseout(function() {
 					previewDiv.hide();