Cleanup after fork pulling.

Assets/MooEditable/MooEditable.Extras.css

@@ -10,4 +10,5 @@
 .mooeditable-ui-toolbar .justifyleft-item .button-icon{ background-position: 0 -32px; } 
 .mooeditable-ui-toolbar .justifyright-item .button-icon{ background-position: 0 -48px; } 
 
-.mooeditable-ui-toolbar .removeformatting-item .button-icon { background: transparent url(Other/delete.png) no-repeat center center; }
+.mooeditable-ui-toolbar .removeformat-item .button-icon { background: transparent url(Other/removeformat.png) no-repeat center center; }
+.mooeditable-ui-toolbar .insertHorizontalRule-item .button-icon { background: transparent url(Other/hr.png) no-repeat center center; }

Demos/MooEditable/MooEditable.Extras.html

@@ -27,7 +27,7 @@
 		<script type="text/javascript">
 			window.addEvent('domready', function(){
 				$('textarea-1').mooEditable({
-					actions: 'bold italic underline strikethrough | formatBlock justifyleft justifyright justifycenter justifyfull | insertunorderedlist insertorderedlist indent outdent | undo redo removeformatting | createlink unlink | urlimage | toggleview'
+					actions: 'bold italic underline strikethrough | formatBlock justifyleft justifyright justifycenter justifyfull | insertunorderedlist insertorderedlist indent outdent insertHorizontalRule | undo redo removeformat | createlink unlink | urlimage | toggleview'
 				});
 
 				// Post submit

Source/MooEditable/MooEditable.Charmap.js

@@ -35,16 +35,261 @@ usage:
 ...
 */
 
-MooEditable.charmap=[[' ',' '],['&','&'],['"','"'],['¢','¢'],['€','€'],['£','£'],['¥','¥'],['©','©'],['®','®'],['™','™'],['‰','‰'],['µ','µ'],['·','·'],['•','•'],['…','…'],['′','′'],['″','″'],['§','§'],['¶','¶'],['ß','ß'],['‹','‹'],['›','›'],['«','«'],['»','»'],['‘','‘'],['’','’'],['“','“'],['”','”'],['‚','‚'],['„','„'],['<','<'],['>','>'],['≤','≤'],['≥','≥'],['–','–'],['—','—'],['¯','¯'],['‾','‾'],['¤','¤'],['¦','¦'],['¨','¨'],['¡','¡'],['¿','¿'],['ˆ','ˆ'],['˜','˜'],['°','°'],['−','−'],['±','±'],['÷','÷'],['⁄','⁄'],['×','×'],['¹','¹'],['²','²'],['³','³'],['¼','¼'],['½','½'],['¾','¾'],['ƒ','ƒ'],['∫','∫'],['∑','∑'],['∞','∞'],['√','√'],['∼','∼'],['≅','≅'],['≈','≈'],['≠','≠'],['≡','≡'],['∈','∈'],['∉','∉'],['∋','∋'],['∏','∏'],['∧','∧'],['∨','∨'],['¬','¬'],['∩','∩'],['∪','∪'],['∂','∂'],['∀','∀'],['∃','∃'],['∅','∅'],['∇','∇'],['∗','∗'],['∝','∝'],['∠','∠'],['´','´'],['¸','¸'],['ª','ª'],['º','º'],['†','†'],['‡','‡'],['À','À'],['Á','Á'],['Â','Â'],['Ã','Ã'],['Ä','Ä'],['Å','Å'],['Æ','Æ'],['Ç','Ç'],['È','È'],['É','É'],['Ê','Ê'],['Ë','Ë'],['Ì','Ì'],['Í','Í'],['Î','Î'],['Ï','Ï'],['Ð','Ð'],['Ñ','Ñ'],['Ò','Ò'],['Ó','Ó'],['Ô','Ô'],['Õ','Õ'],['Ö','Ö'],['Ø','Ø'],['Œ','Œ'],['Š','Š'],['Ù','Ù'],['Ú','Ú'],['Û','Û'],['Ü','Ü'],['Ý','Ý'],['Ÿ','Ÿ'],['Þ','Þ'],['à','à'],['á','á'],['â','â'],['ã','ã'],['ä','ä'],['å','å'],['æ','æ'],['ç','ç'],['è','è'],['é','é'],['ê','ê'],['ë','ë'],['ì','ì'],['í','í'],['î','î'],['ï','ï'],['ð','ð'],['ñ','ñ'],['ò','ò'],['ó','ó'],['ô','ô'],['õ','õ'],['ö','ö'],['ø','ø'],['œ','œ'],['š','š'],['ù','ù'],['ú','ú'],['û','û'],['ü','ü'],['ý','ý'],['þ','þ'],['ÿ','ÿ'],['Α','Α'],['Β','Β'],['Γ','Γ'],['Δ','Δ'],['Ε','Ε'],['Ζ','Ζ'],['Η','Η'],['Θ','Θ'],['Ι','Ι'],['Κ','Κ'],['Λ','Λ'],['Μ','Μ'],['Ν','Ν'],['Ξ','Ξ'],['Ο','Ο'],['Π','Π'],['Ρ','Ρ'],['Σ','Σ'],['Τ','Τ'],['Υ','Υ'],['Φ','Φ'],['Χ','Χ'],['Ψ','Ψ'],['Ω','Ω'],['α','α'],['β','β'],['γ','γ'],['δ','δ'],['ε','ε'],['ζ','ζ'],['η','η'],['θ','θ'],['ι','ι'],['κ','κ'],['λ','λ'],['μ','μ'],['ν','ν'],['ξ','ξ'],['ο','ο'],['π','π'],['ρ','ρ'],['ς','ς'],['σ','σ'],['τ','τ'],['υ','υ'],['φ','φ'],['χ','χ'],['ψ','ψ'],['ω','ω'],['ℵ','ℵ'],['ϖ','ϖ'],['ℜ','ℜ'],['ϑ','ϑ'],['ϒ','ϒ'],['℘','℘'],['ℑ','ℑ'],['←','←'],['↑','↑'],['→','→'],['↓','↓'],['↔','↔'],['↵','↵'],['⇐','⇐'],['⇑','⇑'],['⇒','⇒'],['⇓','⇓'],['⇔','⇔'],['∴','∴'],['⊂','⊂'],['⊃','⊃'],['⊄','⊄'],['⊆','⊆'],['⊇','⊇'],['⊕','⊕'],['⊗','⊗'],['⊥','⊥'],['⋅','⋅'],['⌈','⌈'],['⌉','⌉'],['⌊','⌊'],['⌋','⌋'],['⟨','〈'],['⟩','〉'],['◊','◊'],['♠','♠'],['♣','♣'],['♥','♥'],['♦','♦']];
+MooEditable.charmap=[
+	[' ', ' '],
+	['&', '&'],
+	['"', '"'],
+	['¢', '¢'],
+	['€', '€'],
+	['£', '£'],
+	['¥', '¥'],
+	['©', '©'],
+	['®', '®'],
+	['™', '™'],
+	['‰', '‰'],
+	['µ', 'µ'],
+	['·', '·'],
+	['•', '•'],
+	['…', '…'],
+	['′', '′'],
+	['″', '″'],
+	['§', '§'],
+	['¶', '¶'],
+	['ß', 'ß'],
+	['‹', '‹'],
+	['›', '›'],
+	['«', '«'],
+	['»', '»'],
+	['‘', '‘'],
+	['’', '’'],
+	['“', '“'],
+	['”', '”'],
+	['‚', '‚'],
+	['„', '„'],
+	['<', '<'],
+	['>', '>'],
+	['≤', '≤'],
+	['≥', '≥'],
+	['–', '–'],
+	['—', '—'],
+	['¯', '¯'],
+	['‾', '‾'],
+	['¤', '¤'],
+	['¦', '¦'],
+	['¨', '¨'],
+	['¡', '¡'],
+	['¿', '¿'],
+	['ˆ', 'ˆ'],
+	['˜', '˜'],
+	['°', '°'],
+	['−', '−'],
+	['±', '±'],
+	['÷', '÷'],
+	['⁄', '⁄'],
+	['×', '×'],
+	['¹', '¹'],
+	['²', '²'],
+	['³', '³'],
+	['¼', '¼'],
+	['½', '½'],
+	['¾', '¾'],
+	['ƒ', 'ƒ'],
+	['∫', '∫'],
+	['∑', '∑'],
+	['∞', '∞'],
+	['√', '√'],
+	['∼', '∼'],
+	['≅', '≅'],
+	['≈', '≈'],
+	['≠', '≠'],
+	['≡', '≡'],
+	['∈', '∈'],
+	['∉', '∉'],
+	['∋', '∋'],
+	['∏', '∏'],
+	['∧', '∧'],
+	['∨', '∨'],
+	['¬', '¬'],
+	['∩', '∩'],
+	['∪', '∪'],
+	['∂', '∂'],
+	['∀', '∀'],
+	['∃', '∃'],
+	['∅', '∅'],
+	['∇', '∇'],
+	['∗', '∗'],
+	['∝', '∝'],
+	['∠', '∠'],
+	['´', '´'],
+	['¸', '¸'],
+	['ª', 'ª'],
+	['º', 'º'],
+	['†', '†'],
+	['‡', '‡'],
+	['À', 'À'],
+	['Á', 'Á'],
+	['Â', 'Â'],
+	['Ã', 'Ã'],
+	['Ä', 'Ä'],
+	['Å', 'Å'],
+	['Æ', 'Æ'],
+	['Ç', 'Ç'],
+	['È', 'È'],
+	['É', 'É'],
+	['Ê', 'Ê'],
+	['Ë', 'Ë'],
+	['Ì', 'Ì'],
+	['Í', 'Í'],
+	['Î', 'Î'],
+	['Ï', 'Ï'],
+	['Ð', 'Ð'],
+	['Ñ', 'Ñ'],
+	['Ò', 'Ò'],
+	['Ó', 'Ó'],
+	['Ô', 'Ô'],
+	['Õ', 'Õ'],
+	['Ö', 'Ö'],
+	['Ø', 'Ø'],
+	['Œ', 'Œ'],
+	['Š', 'Š'],
+	['Ù', 'Ù'],
+	['Ú', 'Ú'],
+	['Û', 'Û'],
+	['Ü', 'Ü'],
+	['Ý', 'Ý'],
+	['Ÿ', 'Ÿ'],
+	['Þ', 'Þ'],
+	['à', 'à'],
+	['á', 'á'],
+	['â', 'â'],
+	['ã', 'ã'],
+	['ä', 'ä'],
+	['å', 'å'],
+	['æ', 'æ'],
+	['ç', 'ç'],
+	['è', 'è'],
+	['é', 'é'],
+	['ê', 'ê'],
+	['ë', 'ë'],
+	['ì', 'ì'],
+	['í', 'í'],
+	['î', 'î'],
+	['ï', 'ï'],
+	['ð', 'ð'],
+	['ñ', 'ñ'],
+	['ò', 'ò'],
+	['ó', 'ó'],
+	['ô', 'ô'],
+	['õ', 'õ'],
+	['ö', 'ö'],
+	['ø', 'ø'],
+	['œ', 'œ'],
+	['š', 'š'],
+	['ù', 'ù'],
+	['ú', 'ú'],
+	['û', 'û'],
+	['ü', 'ü'],
+	['ý', 'ý'],
+	['þ', 'þ'],
+	['ÿ', 'ÿ'],
+	['Α', 'Α'],
+	['Β', 'Β'],
+	['Γ', 'Γ'],
+	['Δ', 'Δ'],
+	['Ε', 'Ε'],
+	['Ζ', 'Ζ'],
+	['Η', 'Η'],
+	['Θ', 'Θ'],
+	['Ι', 'Ι'],
+	['Κ', 'Κ'],
+	['Λ', 'Λ'],
+	['Μ', 'Μ'],
+	['Ν', 'Ν'],
+	['Ξ', 'Ξ'],
+	['Ο', 'Ο'],
+	['Π', 'Π'],
+	['Ρ', 'Ρ'],
+	['Σ', 'Σ'],
+	['Τ', 'Τ'],
+	['Υ', 'Υ'],
+	['Φ', 'Φ'],
+	['Χ', 'Χ'],
+	['Ψ', 'Ψ'],
+	['Ω', 'Ω'],
+	['α', 'α'],
+	['β', 'β'],
+	['γ', 'γ'],
+	['δ', 'δ'],
+	['ε', 'ε'],
+	['ζ', 'ζ'],
+	['η', 'η'],
+	['θ', 'θ'],
+	['ι', 'ι'],
+	['κ', 'κ'],
+	['λ', 'λ'],
+	['μ', 'μ'],
+	['ν', 'ν'],
+	['ξ', 'ξ'],
+	['ο', 'ο'],
+	['π', 'π'],
+	['ρ', 'ρ'],
+	['ς', 'ς'],
+	['σ', 'σ'],
+	['τ', 'τ'],
+	['υ', 'υ'],
+	['φ', 'φ'],
+	['χ', 'χ'],
+	['ψ', 'ψ'],
+	['ω', 'ω'],
+	['ℵ', 'ℵ'],
+	['ϖ', 'ϖ'],
+	['ℜ', 'ℜ'],
+	['ϑ', 'ϑ'],
+	['ϒ', 'ϒ'],
+	['℘', '℘'],
+	['ℑ', 'ℑ'],
+	['←', '←'],
+	['↑', '↑'],
+	['→', '→'],
+	['↓', '↓'],
+	['↔', '↔'],
+	['↵', '↵'],
+	['⇐', '⇐'],
+	['⇑', '⇑'],
+	['⇒', '⇒'],
+	['⇓', '⇓'],
+	['⇔', '⇔'],
+	['∴', '∴'],
+	['⊂', '⊂'],
+	['⊃', '⊃'],
+	['⊄', '⊄'],
+	['⊆', '⊆'],
+	['⊇', '⊇'],
+	['⊕', '⊕'],
+	['⊗', '⊗'],
+	['⊥', '⊥'],
+	['⋅', '⋅'],
+	['⌈', '⌈'],
+	['⌉', '⌉'],
+	['⌊', '⌊'],
+	['⌋', '⌋'],
+	['⟨', '〈'],
+	['⟩', '〉'],
+	['◊', '◊'],
+	['♠', '♠'],
+	['♣', '♣'],
+	['♥', '♥'],
+	['♦', '♦']
+];
 
 MooEditable.UI.CharacterDialog = function(editor){
 	var html = 'character <select class="char">';
-    for (var i=0; i<MooEditable.charmap.length; i++) {
-		html += '<option data-code="' + MooEditable.charmap[i][0] + '">' + MooEditable.charmap[i][1] + '</option>'
-    }
-    html += '</select>\
-	<button class="dialog-button dialog-ok-button">OK</button>\
-	<button class="dialog-button dialog-cancel-button">Cancel</button>';
+	for (var i=0, len=MooEditable.charmap.length; i<len; i++) {
+		html += '<option data-code="' + MooEditable.charmap[i][0] + '">' + MooEditable.charmap[i][1] + '</option>';
+	}
+	html += '</select>'
+		+ '<button class="dialog-button dialog-ok-button">OK</button>'
+		+ '<button class="dialog-button dialog-cancel-button">Cancel</button>';
 	return new MooEditable.UI.Dialog(html, {
 		'class': 'mooeditable-prompt-dialog',
 		onClick: function(e){
@@ -60,34 +305,36 @@ MooEditable.UI.CharacterDialog = function(editor){
 			}
 		}
 	});
-
 };
 
 MooEditable.Actions.extend({
 
 	charmap: {
 		title: 'Insert custom character',
-		mode:'text',
-        dialogs: {
-            prompt: function(editor){ return MooEditable.UI.CharacterDialog(editor) }
-        },
+		mode: 'text',
+		dialogs: {
+			prompt: function(editor){
+				return MooEditable.UI.CharacterDialog(editor);
+			}
+		},
 		command: function() {
-            this.dialogs.charmap.prompt.open();
+			this.dialogs.charmap.prompt.open();
 		},
 		events: {
-            toggleView: function(){			
-                if(this.mode == 'textarea') {                
-                    var s = this.textarea.get('value');
-                    // when switching from iframe to textarea, we need to convert special symbols to html entities
-                    MooEditable.charmap.each(function(e) { 
-                        if(!['&amp;','&gt;','&lt;','&quot;','&nbsp;'].contains(e[0])) {
-							var r = new RegExp(String.fromCharCode(parseInt(e[1].replace('&#','').replace(';',''))),"g");
-                            s = s.replace(r,e[0]); 
+			toggleView: function(){
+				if (this.mode == 'textarea'){
+					var s = this.textarea.get('value');
+					// when switching from iframe to textarea, we need to convert special symbols to html entities
+					MooEditable.charmap.each(function(e){
+						if (!['&amp;', '&gt;', '&lt;', '&quot;', '&nbsp;'].contains(e[0])){
+							var r = new RegExp(String.fromCharCode(parseInt(e[1].replace('&#', '').replace(';', ''))), 'g');
+							s = s.replace(r, e[0]);
 						}
-                    },this);                    
-                    this.textarea.set('value',s);
-                }
-            }
+					}, this);
+					this.textarea.set('value', s);
+				}
+			}
 		}
-    }	
+	}
+
 });

Source/MooEditable/MooEditable.Extras.js

@@ -71,11 +71,17 @@ MooEditable.Actions.extend({
 		}
 	},
 
-	removeformatting: {
-		title: 'Remove formatting',
-		mode: 'text',
-		command: function() {
-			this.execute('removeformat',false,'');
+	removeformat: {
+		title: 'Remove Formatting'
+	},
+
+	insertHorizontalRule: {
+		title: 'Insert Horizontal Rule',
+		states: {
+			tags: ['hr']
+		},
+		command: function(){
+			this.selection.insertContent('<hr>');
 		}
 	}
 

Source/MooEditable/MooEditable.Pagebreak.js

@@ -44,15 +44,15 @@ MooEditable.Actions.extend({
 			this.selection.insertContent('<img class="mooeditable-visual-aid mooeditable-pagebreak" />');
 		},
 		events: {
-            beforeToggleView: function(){ // code to run when switching from iframe to textarea
-                if(this.mode == 'iframe'){
-                    var s = this.getContent().replace(/<img([^>]*)class="mooeditable-visual-aid mooeditable-pagebreak"([^>]*)>/gi,'<!-- page break -->');
-                    this.setContent(s);
-                } else {
-                    var s = this.textarea.get('value').replace(/<!-- page break -->/gi,'<img class="mooeditable-visual-aid mooeditable-pagebreak" />');
-                    this.textarea.set('value',s);	
-                }
-            },
+			beforeToggleView: function(){ // code to run when switching from iframe to textarea
+				if (this.mode == 'iframe'){
+					var s = this.getContent().replace(/<img([^>]*)class="mooeditable-visual-aid mooeditable-pagebreak"([^>]*)>/gi, '<!-- page break -->');
+					this.setContent(s);
+				} else {
+					var s = this.textarea.get('value').replace(/<!-- page break -->/gi, '<img class="mooeditable-visual-aid mooeditable-pagebreak" />');
+					this.textarea.set('value', s);
+				}
+			},
 			render: function(){
 				this.options.extraCSS = 'img.mooeditable-pagebreak { display:block; width:100%; height:16px; background: url(../../Assets/MooEditable/Other/pagebreak.gif) repeat-x; }' + this.options.extraCSS;
 			}