rails_kindeditor 0.3.6 → 0.3.7

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

@@ -184,7 +184,6 @@ KindEditor.plugin('image', function(K) {
 		var uploadbutton = K.uploadbutton({
 			button : K('.ke-upload-button', div)[0],
 			fieldName : filePostName,
-			url : K.addParam(uploadJson, 'dir=image'),
 			form : K('.ke-form', div),
 			target : target,
 			width: 60,
@@ -277,7 +276,7 @@ KindEditor.plugin('image', function(K) {
 				return false;
 			}
 		});
-		if (tabIndex === 0) {
+		if (showRemote && tabIndex === 0) {
 			urlBox[0].focus();
 			urlBox[0].select();
 		}

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

@@ -525,7 +525,13 @@ SWFUpload.prototype.loadFlash = function () {
 // Private: getFlashHTML generates the object tag needed to embed the flash in to the document
 SWFUpload.prototype.getFlashHTML = function () {
 	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
 				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
 				'<param name="movie" value="', this.settings.flash_url, '" />',
 				'<param name="quality" value="high" />',

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

@@ -8,14 +8,17 @@
 *******************************************************************************/
 
 KindEditor.plugin('pagebreak', function(K) {
-	var self = this, name = 'pagebreak';
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
 	self.clickToolbar(name, function() {
 		var cmd = self.cmd, range = cmd.range;
 		self.focus();
 		range.enlarge(true);
 		cmd.split(true);
 		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<p id="__kindeditor_tail_tag__"></p>';
-		self.insertHtml('<hr style="page-break-after: always;" class="ke-pagebreak" />' + tail);
+		self.insertHtml(pagebreakHtml + tail);
 		if (tail !== '') {
 			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
 			range.selectNodeContents(p[0]);

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

@@ -15,7 +15,7 @@ KindEditor.plugin('template', function(K) {
 	}
 	self.clickToolbar(name, function() {
 		var lang = self.lang(name + '.'),
-			arr = ['<div class="ke-plugin-template" style="padding:10px 20px;">',
+			arr = ['<div style="padding:10px 20px;">',
 				'<div class="ke-header">',
 				// left start
 				'<div class="ke-left">',

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

@@ -635,6 +635,23 @@
 	margin: 0;
 	padding: 0;
 }
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
 .ke-dialog-content {
 	background-color: #FFF;
 	width: 100%;
@@ -1128,21 +1145,4 @@
 	width: 30%;
 	text-align: center;
 }
-/* template */
-.ke-plugin-template .ke-header {
-	width: 100%;
-	margin-bottom: 10px;
-}
-.ke-plugin-template label {
-	margin-right: 0;
-	cursor: pointer;
-	font-weight: normal;
-	display: inline;
-	vertical-align: top;
-}
-.ke-plugin-template .ke-left {
-	float: left;
-}
-.ke-plugin-template .ke-right {
-	float: right;
-}
+