redactor-rails 0.4.5 → 0.5.0

data/vendor/assets/javascripts/redactor-rails/langs/zh_tw.js

@@ -1,74 +1,73 @@
 (function ($) {
 $.Redactor.opts.langs['zh_tw'] = {
-  html: 'HTML',
-  video: '插入影片',
-  image: '插入圖片',
-  table: '表格',
-  link: '連結',
-  link_insert: '插入連結',
-  link_edit: 'Edit link',
-  unlink: '移除連結',
-  formatting: '樣式',
-  paragraph: '段落',
-  quote: '引用',
-  code: '原始碼',
-  header1: '標題 1',
-  header2: '標題 2',
-  header3: '標題 3',
-  header4: '標題 4',
-  header5: '標題 5',
-  bold:  '將文字變成粗體',
-  italic: '將文字變成斜體',
-  fontcolor: '選擇文字顏色',
-  backcolor: '選擇文字底色',
-  unorderedlist: '項目列表',
-  orderedlist: '編號列表',  
-  outdent: '減少縮排',
-  indent: '增加縮排',
-  cancel: '取消', 
-  insert: '插入',
-  save: '儲存', 
-  _delete: '刪除',
-  insert_table: '插入表格',   
-  insert_row_above: '加入上方橫列',
-  insert_row_below: '加入下方橫列',
-  insert_column_left: '加入左方直欄',
-  insert_column_right: '加入右方直欄',                  
-  delete_column: '刪除整欄',                  
-  delete_row: '刪除整列',                 
-  delete_table: '刪除表格',
-  rows: '橫列',
-  columns: '直欄',  
-  add_head: '加入表格標題',
-  delete_head: '刪除表格標題',  
-  title: '標題',
-  image_position: '位置',
-  none: '無',
-  left: '靠左',
-  right: '靠右',
-  image_web_link: '連結',
-  text: '內文',
-  mailto: 'Email',
-  web: '網址',
-  video_html_code: '嵌入影片的原始碼',
-  file: '插入文件', 
-  upload: '上傳',
-  download: '下載',
-  choose: '選擇',
-  or_choose: '或選擇',
-  drop_file_here: '將文件拖曳至此',
-  align_left: '將文字對齊至左側', 
-  align_center: '將文字置中',
-  align_right: '將文字對齊至右側',
-  align_justify: '對齊至兩側',
-  horizontalrule: '插入水平線',
-  fullscreen: '全銀幕',
-  deleted: '刪除線',
-  anchor: '錨點',
-  link_new_tab: '另開視窗',
-  underline: '底線',
-  alignment: '對齊',
-  filename: '名稱 (選填)',
-  edit: '編輯'
+	html: 'HTML',
+	video: '插入影片',
+	image: '插入圖片',
+	table: '表格',
+	link: '連結',
+	link_insert: '插入連結',
+	link_edit: 'Edit link',
+	unlink: '移除連結',
+	formatting: '樣式',
+	paragraph: '段落',
+	quote: '引用',
+	code: '原始碼',
+	header1: '標題 1',
+	header2: '標題 2',
+	header3: '標題 3',
+	header4: '標題 4',
+	bold:  '將文字變成粗體',
+	italic: '將文字變成斜體',
+	fontcolor: '選擇文字顏色',
+	backcolor: '選擇文字底色',
+	unorderedlist: '項目列表',
+	orderedlist: '編號列表',
+	outdent: '減少縮排',
+	indent: '增加縮排',
+	cancel: '取消',
+	insert: '插入',
+	save: '儲存',
+	_delete: '刪除',
+	insert_table: '插入表格',
+	insert_row_above: '加入上方橫列',
+	insert_row_below: '加入下方橫列',
+	insert_column_left: '加入左方直欄',
+	insert_column_right: '加入右方直欄',
+	delete_column: '刪除整欄',
+	delete_row: '刪除整列',
+	delete_table: '刪除表格',
+	rows: '橫列',
+	columns: '直欄',
+	add_head: '加入表格標題',
+	delete_head: '刪除表格標題',
+	title: '標題',
+	image_position: '位置',
+	none: '無',
+	left: '靠左',
+	right: '靠右',
+	image_web_link: '連結',
+	text: '內文',
+	mailto: 'Email',
+	web: '網址',
+	video_html_code: '嵌入影片的原始碼',
+	file: '插入文件',
+	upload: '上傳',
+	download: '下載',
+	choose: '選擇',
+	or_choose: '或選擇',
+	drop_file_here: '將文件拖曳至此',
+	align_left:	'將文字對齊至左側',
+	align_center: '將文字置中',
+	align_right: '將文字對齊至右側',
+	align_justify: '對齊至兩側',
+	horizontalrule: '插入水平線',
+	fullscreen: '全銀幕',
+	deleted: '刪除線',
+	anchor: '錨點',
+	link_new_tab: 'Open link in new tab',
+	underline: 'Underline',
+	alignment: 'Alignment',
+	filename: 'Name (optional)',
+	edit: 'Edit'
 };
 })( jQuery );

data/vendor/assets/javascripts/redactor-rails/plugins/clips.js

@@ -1,35 +1,61 @@
 if (!RedactorPlugins) var RedactorPlugins = {};
 
-RedactorPlugins.clips = {
-	init: function()
-	{
-		var callback = $.proxy(function()
+RedactorPlugins.clips = function()
+{
+	return {
+		init: function()
 		{
-			$('#redactor_modal').find('.redactor_clip_link').each($.proxy(function(i, s)
+			var items = [
+				['Lorem ipsum...', 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'],
+				['Red label', '<span class="label-red">Label</span>']
+			];
+
+			this.clips.template = $('<ul id="redactor-modal-list">');
+
+			for (var i = 0; i < items.length; i++)
 			{
-				$(s).click($.proxy(function()
-				{
-					this.insertClip($(s).next().html());
-					return false;
+				var li = $('<li>');
+				var a = $('<a href="#" class="redactor-clip-link">').text(items[i][0]);
+				var div = $('<div class="redactor-clip">').hide().html(items[i][1]);
 
-				}, this));
-			}, this));
+				li.append(a);
+				li.append(div);
+				this.clips.template.append(li);
+			}
 
-			this.selectionSave();
-			this.bufferSet();
+			this.modal.addTemplate('clips', '<section>' + this.utils.getOuterHtml(this.clips.template) + '</section>');
+
+			var button = this.button.add('clips', 'Clips');
+			this.button.addCallback(button, this.clips.show);
+
+		},
+		show: function()
+		{
+			this.modal.load('clips', 'Insert Clips', 400);
 
-		}, this );
+			this.modal.createCancelButton();
 
-		this.buttonAdd('clips', 'Clips', function(e)
+			$('#redactor-modal-list').find('.redactor-clip-link').each($.proxy(this.clips.load, this));
+
+			this.selection.save();
+			this.modal.show();
+		},
+		load: function(i,s)
+		{
+			$(s).on('click', $.proxy(function(e)
+			{
+				e.preventDefault();
+				this.clips.insert($(s).next().html());
+
+			}, this));
+		},
+		insert: function(html)
 		{
-			this.modalInit('Clips', '#clipsmodal', 500, callback);
-		});
-	},
-	insertClip: function(html)
-	{
-		this.selectionRestore();
-		this.insertHtml($.trim(html));
-		this.modalClose();
-	}
+			this.selection.restore();
+			this.insert.html(html);
+			this.modal.close();
+			this.observe.load();
+		}
+	};
 };
 

data/vendor/assets/javascripts/redactor-rails/plugins/fontcolor.js

@@ -1,81 +1,76 @@
 if (!RedactorPlugins) var RedactorPlugins = {};
 
-RedactorPlugins.fontcolor = {
-	init: function()
+(function($)
+{
+	RedactorPlugins.fontcolor = function()
 	{
-		var colors = [
-			'#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00',
-			'#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca',
-			'#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694',
-			'#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314',
-			'#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100',
-			'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b',  '#974806', '#7f6000'
-		];
-
-		var buttons = ['fontcolor', 'backcolor'];
-
-		this.buttonAddSeparator();
-
-		for (var i = 0; i < 2; i++)
-		{
-			var name = buttons[i];
-
-			var $dropdown = $('<div class="redactor_dropdown redactor_dropdown_box_' + name + '" style="display: none; width: 243px;">');
-
-			this.pickerBuild($dropdown, name, colors);
-			$(this.$toolbar).append($dropdown);
-
-			this.buttonAdd(name, this.opts.curLang[name], $.proxy(function(btnName, $button, btnObject, e)
+		return {
+			init: function()
 			{
-				this.dropdownShow(e, btnName);
-
-			}, this));
-		}
-	},
-	pickerBuild: function($dropdown, name, colors)
-	{
-		var rule = 'color';
-		if (name === 'backcolor') rule = 'background-color';
-
-		var _self = this;
-		var onSwatch = function(e)
-		{
-			e.preventDefault();
-
-			var $this = $(this);
-			_self.pickerSet($this.data('rule'), $this.attr('rel'));
-
-		}
-
-		var len = colors.length;
-		for (var z = 0; z < len; z++)
-		{
-			var color = colors[z];
-
-			var $swatch = $('<a rel="' + color + '" data-rule="' + rule +'" href="#" style="float: left; font-size: 0; border: 2px solid #fff; padding: 0; margin: 0; width: 20px; height: 20px;"></a>');
-			$swatch.css('background-color', color);
-			$dropdown.append($swatch);
-			$swatch.on('click', onSwatch);
-		}
-
-		var $elNone = $('<a href="#" style="display: block; clear: both; padding: 4px 0; font-size: 11px; line-height: 1;"></a>')
-		.html(this.opts.curLang.none)
-		.on('click', function(e)
-		{
-			e.preventDefault();
-			_self.pickerSet(rule, false);
-		});
-
-		$dropdown.append($elNone);
-	},
-	pickerSet: function(rule, type)
-	{
-		this.bufferSet();
-
-		this.$editor.focus();
-		this.inlineRemoveStyle(rule);
-		if (type !== false) this.inlineSetStyle(rule, type);
-		if (this.opts.air) this.$air.fadeOut(100);
-		this.sync();
-	}
-};
+				var colors = [
+					'#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00',
+					'#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca',
+					'#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694',
+					'#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314',
+					'#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100',
+					'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b',  '#974806', '#7f6000'
+				];
+
+				var buttons = ['fontcolor', 'backcolor'];
+
+				for (var i = 0; i < 2; i++)
+				{
+					var name = buttons[i];
+
+					var button = this.button.add(name, this.lang.get(name));
+					var $dropdown = this.button.addDropdown(button);
+
+					$dropdown.width(242);
+					this.fontcolor.buildPicker($dropdown, name, colors);
+
+				}
+			},
+			buildPicker: function($dropdown, name, colors)
+			{
+				var rule = (name == 'backcolor') ? 'background-color' : 'color';
+
+				var len = colors.length;
+				var self = this;
+				var func = function(e)
+				{
+					e.preventDefault();
+					self.fontcolor.set($(this).data('rule'), $(this).attr('rel'));
+				};
+
+				for (var z = 0; z < len; z++)
+				{
+					var color = colors[z];
+
+					var $swatch = $('<a rel="' + color + '" data-rule="' + rule +'" href="#" style="float: left; font-size: 0; border: 2px solid #fff; padding: 0; margin: 0; width: 22px; height: 22px;"></a>');
+					$swatch.css('background-color', color);
+					$swatch.on('click', func);
+
+					$dropdown.append($swatch);
+				}
+
+				var $elNone = $('<a href="#" style="display: block; clear: both; padding: 5px; font-size: 12px; line-height: 1;"></a>').html(this.lang.get('none'));
+				$elNone.on('click', $.proxy(function(e)
+				{
+					e.preventDefault();
+					this.fontcolor.remove(rule);
+
+				}, this));
+
+				$dropdown.append($elNone);
+			},
+			set: function(rule, type)
+			{
+				this.inline.format('span', 'style', rule + ': ' + type + ';');
+			},
+			remove: function(rule)
+			{
+				this.inline.removeStyleRule(rule);
+			}
+		};
+	};
+})(jQuery);

data/vendor/assets/javascripts/redactor-rails/plugins/fontfamily.js

@@ -1,27 +1,35 @@
 if (!RedactorPlugins) var RedactorPlugins = {};
 
-RedactorPlugins.fontfamily = {
-	init: function ()
+(function($)
+{
+	RedactorPlugins.fontfamily = function()
 	{
-		var fonts = [ 'Arial', 'Helvetica', 'Georgia', 'Times New Roman', 'Monospace' ];
-		var that = this;
-		var dropdown = {};
+		return {
+			init: function ()
+			{
+				var fonts = [ 'Arial', 'Helvetica', 'Georgia', 'Times New Roman', 'Monospace' ];
+				var that = this;
+				var dropdown = {};
 
-		$.each(fonts, function(i, s)
-		{
-			dropdown['s' + i] = { title: s, callback: function() { that.setFontfamily(s); }};
-		});
+				$.each(fonts, function(i, s)
+				{
+					dropdown['s' + i] = { title: s, func: function() { that.fontfamily.set(s); }};
+				});
 
-		dropdown['remove'] = { title: 'Remove font', callback: function() { that.resetFontfamily(); }};
+				dropdown.remove = { title: 'Remove Font Family', func: that.fontfamily.reset };
 
-		this.buttonAdd('fontfamily', 'Change font family', false, dropdown);
-	},
-	setFontfamily: function (value)
-	{
-		this.inlineSetStyle('font-family', value);
-	},
-	resetFontfamily: function()
-	{
-		this.inlineRemoveStyle('font-family');
-	}
-};
+				var button = this.button.add('fontfamily', 'Change Font Family');
+				this.button.addDropdown(button, dropdown);
+
+			},
+			set: function (value)
+			{
+				this.inline.format('span', 'style', 'font-family:' + value + ';');
+			},
+			reset: function()
+			{
+				this.inline.removeStyleRule('font-family');
+			}
+		};
+	};
+})(jQuery);

data/vendor/assets/javascripts/redactor-rails/plugins/fontsize.js

@@ -1,27 +1,34 @@
 if (!RedactorPlugins) var RedactorPlugins = {};
 
-RedactorPlugins.fontsize = {
-	init: function()
-	{
-		var fonts = [10, 11, 12, 14, 16, 18, 20, 24, 28, 30];
-		var that = this;
-		var dropdown = {};
+(function($)
+{
+  RedactorPlugins.fontsize = function()
+  {
+    return {
+      init: function()
+      {
+        var fonts = [10, 11, 12, 14, 16, 18, 20, 24, 28, 30];
+        var that = this;
+        var dropdown = {};
 
-		$.each(fonts, function(i, s)
-		{
-			dropdown['s' + i] = { title: s + 'px', callback: function() { that.setFontsize(s); } };
-		});
+        $.each(fonts, function(i, s)
+        {
+          dropdown['s' + i] = { title: s + 'px', func: function() { that.fontsize.set(s); } };
+        });
 
-		dropdown['remove'] = { title: 'Remove font size', callback: function() { that.resetFontsize(); } };
+        dropdown.remove = { title: 'Remove Font Size', func: that.fontsize.reset };
 
-		this.buttonAdd( 'fontsize', 'Change font size', false, dropdown);
-	},
-	setFontsize: function(size)
-	{
-		this.inlineSetStyle('font-size', size + 'px');
-	},
-	resetFontsize: function()
-	{
-		this.inlineRemoveStyle('font-size');
-	}
-};
+        var button = this.button.add('fontsize', 'Change Font Size');
+        this.button.addDropdown(button, dropdown);
+      },
+      set: function(size)
+      {
+        this.inline.format('span', 'style', 'font-size: ' + size + 'px;');
+      },
+      reset: function()
+      {
+        this.inline.removeStyleRule('font-size');
+      }
+    };
+  };
+})(jQuery);