From 4e1e5985a1a6763d5413ccd0524213d8cd3dc4a7 2008-01-13 18:39:37
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2008-01-13 18:39:37
Subject: [PATCH] Wiki toolbar improvements (mainly for Firefox).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1063 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/public/images/jstoolbar/bt_h1.png b/public/images/jstoolbar/bt_h1.png
new file mode 100644
index 0000000000000000000000000000000000000000..01f3eec0da09b79d6f034e68cfd31179826f7f17
GIT binary patch
literal 995
zc%17D@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;CtKMwSZN28IR(C%7WDfLhs0Jbhi+Z!q!-idffw
zGTI3g;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z1tSuim;WXU%mdn<E{-7;w~`Z%FiCg_r!X*yNG(@TX1*e#;j8K>p`hczecO=LlS3eh
aNs@u(AfsjOf>Yi=Z492SelF{r5}E*+1Tgsk

literal 0
Hc$@<O00001

diff --git a/public/images/jstoolbar/bt_h2.png b/public/images/jstoolbar/bt_h2.png
new file mode 100644
index 0000000000000000000000000000000000000000..36b15048e67810f070655de8d1c67fa7d2d3b04a
GIT binary patch
literal 994
zc%17D@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;HF#CT0rS28IR(;_tnyfLhs0Jbhi+Z!q!-il}FQ
z&ie)w;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z1tSuim;WXU%mZ4UE{-7;w~`Z%FiB*nonT<$;F_<X%*@Q?x=TSsK+$8N>x?Fqipd=d
am>Goi7@bd6WyJz@F?hQAxvX<aXaWFR6EjT!

literal 0
Hc$@<O00001

diff --git a/public/images/jstoolbar/bt_h3.png b/public/images/jstoolbar/bt_h3.png
new file mode 100644
index 0000000000000000000000000000000000000000..029d648e54ebdbaa7c246c76493247dbcfe94c25
GIT binary patch
literal 993
zc%17D@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B(IRt5%E28IgS28IR(e+)D?1GTc3c>21s-(chw)Z}tG
zQe_Ji;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z1tSuim;WXU%mbR9E{-7;w~`Z%FiEh*O<?2@5V3P~V-w-puOK3z=&@(!j3yO}c{3Oo
Z8RX0uy=7-fn*cR2c)I$ztaD0e0s!?mFp~fP

literal 0
Hc$@<O00001

diff --git a/public/images/jstoolbar/bt_heading.png b/public/images/jstoolbar/bt_img.png
similarity index 52%
rename from public/images/jstoolbar/bt_heading.png
rename to public/images/jstoolbar/bt_img.png
index a143f23a7aa4afb87cf3f96b0533b2e11e5aea2b..91c9a8a87caa26e20c36a13412c39b7ba9bda2fc 100644
GIT binary patch
delta 505
zc$@+G0S5k`1GWT^Bug)JMObu0a%Ew3X>V>IRB3Hx0Ay)xE+8>8AZlT5b}k??FfceE
zF*rIfFgh?XAS*C2FfjZuDYF0o00(qQO+^RT0Sys0F*uc-hmme4e*ua~L_t(|+QpN-
zPQx%1g>A=95NQYqk<tl-5Fi8yCM4K+0A@xW2(j@1tnADz42(!fpl(%LMg6B~BNE54
zjgyu_+e~HX9jue%d_Kvw4TB&6vlg0}oGXk+>f!O(?ISJ#=OC7e6HCkiQGx*yNev(a
zaC&_T5BB#a;ehKEf4K$VUvIJ?79FpekxVc`ILU#@0@K{k^h2Hj>lk5dr0@L_Q!Bub
z$xIk(L>~jj<nVzCEd$1yf(?VbZs(tf_NAPndl9lTC3sY4tY(-;5TYo~f|=kOYj->O
zx(eZvD(7VL{=IaYz#Xz`IbBbF;w!X(Ghm9#>(*PRPZ<yVf3TTs6^~Xd^&_CmdgW?E
zC#H#RD7pmTcxtOyyW9L|dPSeMrA)e_1}KwLgdp(|@0FKr({XZfMsnMC-NuU$JOR^=
zDj}sv1y%jha;-|Ob-rt7eYPj!_>jgWC_D+|51h`WBi6y94IDc^LjHBO;pjelo|mQ#
vYoG^H1BWrzBlrC!%PJHKlkf~Rzx(_RY_z<Fdu1od00000NkvXXu0mjfvYXn2

delta 353
zc$@)Y0iOQ01fK(tBuXxHMObu0a%Ew3X>V>IRB3Hx0Ay)xE+8>6AZ=lCb09J>FgGAE
zGCDIhIy5#QD=;xIFmacvO8@`>2XskIMF-ad3kx$L=NaK?k#8q|0Q5;jK~#9!#Z)m0
zgfI|1k2Hc{A!uRg5B!IXVCjo2EqsQM($Y?RgAdTkLP%qA0}DA!*5ee8+hW<BWSq?o
z=qRNgcjI}R`7`o3j;`w>-yzp^t@Bwp?8261Ns?sWcOk?yO<@>bP;QzAOccndPo<R=
z>$*l!grl-7kx>JGQCu*}ZQIWC?E8LIRi5Xe2J-FLw4^-G!Oybn)7p$l`o1T;>pHYj
zN@{`IW1HlnC~!57V`{f;3xWU$aGQLvN;_l^$a;2ovv$Z1-ZR@Fh#TVpVLf{*lSA}8
zLx2#*GyRz~O$ix>!B7T5N4Rsku&eREpTP^uP%B1qxk7sk00000NkvXXu0mjfjANJY

diff --git a/public/images/jstoolbar/bt_pre.png b/public/images/jstoolbar/bt_pre.png
new file mode 100644
index 0000000000000000000000000000000000000000..df3f917d0eebb3d8ddcb46a2eee079aae81b2a20
GIT binary patch
literal 224
zc%17D@N?(olHy`uVBq!ia0vp^A|TAj3?#R^_xk}Uu@cva66d1S#FEVXJcW?V+*Aew
zLwy4aeFKxKVg@Ck3ic9DUsv`UjJ!O|R+1gtW&wpb3p^r=85p=efH0%e8j~47L6&q!
zUq=Rpjs4tz5?O(Kwg8_HS0Mf7)x86$CHsIZrjj7P;QtIyw;Ol?dAgo1jv*Ddl7IaF
z&&;e>6S2JE;hHCGZJVb#<OCilxbcbkaHTYJ+h>QJpKp9+V7RJk_(rq0_#jXtgQu&X
J%Q~loCIFC%L`nbv

literal 0
Hc$@<O00001

diff --git a/public/javascripts/jstoolbar.js b/public/javascripts/jstoolbar.js
index fd4611e..b94a4ed 100644
--- a/public/javascripts/jstoolbar.js
+++ b/public/javascripts/jstoolbar.js
@@ -228,6 +228,58 @@ jsToolBar.prototype = {
 		this.encloseSelection(stag,etag);
 	},
 	
+	encloseLineSelection: function(prefix, suffix, fn) {
+		this.textarea.focus();
+		
+		prefix = prefix || '';
+		suffix = suffix || '';
+		
+		var start, end, sel, scrollPos, subst, res;
+		
+		if (typeof(document["selection"]) != "undefined") {
+			sel = document.selection.createRange().text;
+		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+			start = this.textarea.selectionStart;
+			end = this.textarea.selectionEnd;
+			scrollPos = this.textarea.scrollTop;
+			// go to the start of the line
+			start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
+			// go to the end of the line
+            end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
+			sel = this.textarea.value.substring(start, end);
+		}
+		
+		if (sel.match(/ $/)) { // exclude ending space char, if any
+			sel = sel.substring(0, sel.length - 1);
+			suffix = suffix + " ";
+		}
+		
+		if (typeof(fn) == 'function') {
+			res = (sel) ? fn.call(this,sel) : fn('');
+		} else {
+			res = (sel) ? sel : '';
+		}
+		
+		subst = prefix + res + suffix;
+		
+		if (typeof(document["selection"]) != "undefined") {
+			document.selection.createRange().text = subst;
+			var range = this.textarea.createTextRange();
+			range.collapse(false);
+			range.move('character', -suffix.length);
+			range.select();
+		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+			this.textarea.value = this.textarea.value.substring(0, start) + subst +
+			this.textarea.value.substring(end);
+			if (sel) {
+				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
+			} else {
+				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
+			}
+			this.textarea.scrollTop = scrollPos;
+		}
+	},
+	
 	encloseSelection: function(prefix, suffix, fn) {
 		this.textarea.focus();
 		
@@ -370,28 +422,43 @@ jsToolBar.prototype.elements.code = {
 // spacer
 jsToolBar.prototype.elements.space1 = {type: 'space'}
 
-// heading
-jsToolBar.prototype.elements.heading = {
+// headings
+jsToolBar.prototype.elements.h1 = {
 	type: 'button',
-	title: 'Heading',
+	title: 'Heading 1',
 	fn: {
-		wiki: function() {
-			this.encloseSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return 'h2. '+str.replace(/\n/g,"\n* ");
-			});
+		wiki: function() { 
+		  this.encloseLineSelection('h1. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
+		}
+	}
+}
+jsToolBar.prototype.elements.h2 = {
+	type: 'button',
+	title: 'Heading 2',
+	fn: {
+		wiki: function() { 
+		  this.encloseLineSelection('h2. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
+		}
+	}
+}
+jsToolBar.prototype.elements.h3 = {
+	type: 'button',
+	title: 'Heading 3',
+	fn: {
+		wiki: function() { 
+		  this.encloseLineSelection('h3. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
 		}
 	}
 }
-
-// br
-//jsToolBar.prototype.elements.br = {
-//	type: 'button',
-//	title: 'Line break',
-//	fn: {
-//		wiki: function() { this.encloseSelection("%%%\n",'') }
-//	}
-//}
 
 // spacer
 jsToolBar.prototype.elements.space2 = {type: 'space'}
@@ -402,9 +469,9 @@ jsToolBar.prototype.elements.ul = {
 	title: 'Unordered list',
 	fn: {
 		wiki: function() {
-			this.encloseSelection('','',function(str) {
+			this.encloseLineSelection('','',function(str) {
 				str = str.replace(/\r/g,'');
-				return '* '+str.replace(/\n/g,"\n* ");
+				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
 			});
 		}
 	}
@@ -416,53 +483,39 @@ jsToolBar.prototype.elements.ol = {
 	title: 'Ordered list',
 	fn: {
 		wiki: function() {
-			this.encloseSelection('','',function(str) {
+			this.encloseLineSelection('','',function(str) {
 				str = str.replace(/\r/g,'');
-				return '# '+str.replace(/\n/g,"\n# ");
+				return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
 			});
 		}
 	}
 }
 
+// pre
+jsToolBar.prototype.elements.pre = {
+	type: 'button',
+	title: 'Preformatted text',
+	fn: {
+		wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
+	}
+}
+
 // spacer
 jsToolBar.prototype.elements.space3 = {type: 'space'}
 
-// link
-/*
+// wiki page
 jsToolBar.prototype.elements.link = {
 	type: 'button',
-	title: 'Link',
-	fn: {},
-	href_prompt: 'Please give page URL:',
-	hreflang_prompt: 'Language of this page:',
-	default_hreflang: '',
-	prompt: function(href,hreflang) {
-		href = href || '';
-		hreflang = hreflang || this.elements.link.default_hreflang;
-		
-		href = window.prompt(this.elements.link.href_prompt,href);
-		if (!href) { return false; }
-		
-		hreflang = ""
-		
-		return { href: this.stripBaseURL(href), hreflang: hreflang };
+	title: 'Wiki Page Link',
+	fn: {
+		wiki: function() { this.encloseSelection("[[", "]]") }
 	}
 }
-
-jsToolBar.prototype.elements.link.fn.wiki = function() {
-	var link = this.elements.link.prompt.call(this);
-	if (link) {
-		var stag = '"';
-		var etag = '":'+link.href;
-		this.encloseSelection(stag,etag);
-	}
-};
-*/
-// link or wiki page
-jsToolBar.prototype.elements.link = {
+// image
+jsToolBar.prototype.elements.img = {
 	type: 'button',
-	title: 'Link',
+	title: 'Inline image',
 	fn: {
-		wiki: function() { this.encloseSelection("[[", "]]") }
+		wiki: function() { this.encloseSelection("!", "!") }
 	}
 }
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 62976e5..df5d2a6 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -67,8 +67,14 @@
 .jstb_br {
 	background-image: url(../images/jstoolbar/bt_br.png);
 }
-.jstb_heading {
-	background-image: url(../images/jstoolbar/bt_heading.png);
+.jstb_h1 {
+	background-image: url(../images/jstoolbar/bt_h1.png);
+}
+.jstb_h2 {
+	background-image: url(../images/jstoolbar/bt_h2.png);
+}
+.jstb_h3 {
+	background-image: url(../images/jstoolbar/bt_h3.png);
 }
 .jstb_ul {
 	background-image: url(../images/jstoolbar/bt_ul.png);
@@ -76,6 +82,12 @@
 .jstb_ol {
 	background-image: url(../images/jstoolbar/bt_ol.png);
 }
+.jstb_pre {
+	background-image: url(../images/jstoolbar/bt_pre.png);
+}
 .jstb_link {
 	background-image: url(../images/jstoolbar/bt_link.png);
 }
+.jstb_img {
+	background-image: url(../images/jstoolbar/bt_img.png);
+}