[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31636] third_party/codemirror

[<rob...@us...>]

Revision: 31636
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31636&view=rev
Author:   robertplummer
Date:     2010-12-23 23:49:56 +0000 (Thu, 23 Dec 2010)

Log Message:
-----------
[FIX] cleaned up a few function calls
[ADD] added deleted text

Modified Paths:
--------------
    third_party/codemirror/css/tikiwikisyntaxcolors.css
    third_party/codemirror/js/parsetikisyntax.js

Modified: third_party/codemirror/css/tikiwikisyntaxcolors.css
===================================================================
--- third_party/codemirror/css/tikiwikisyntaxcolors.css	2010-12-23 22:52:41 UTC (rev 31635)
+++ third_party/codemirror/css/tikiwikisyntaxcolors.css	2010-12-23 23:49:56 UTC (rev 31636)
@@ -63,6 +63,10 @@
 	color: navy;
 	font-weight: bold;
 }
+span.tw-deleted {
+	text-decoration: line-through;
+	color: #303030;
+}
 span.tw-header {
 	font-size: 1.1em;
 	font-weight: bold;

Modified: third_party/codemirror/js/parsetikisyntax.js
===================================================================
--- third_party/codemirror/js/parsetikisyntax.js	2010-12-23 22:52:41 UTC (rev 31635)
+++ third_party/codemirror/js/parsetikisyntax.js	2010-12-23 23:49:56 UTC (rev 31636)
@@ -56,11 +56,15 @@
 						return "tw-text";
 					}
 					break;
-				case "-": //titleBar
-					if (source.lookAhead("=", true)) {
+				case "-": 
+					if (source.lookAhead("=", true)) {//titleBar
 						setState(inTitleBar);
 						return null;
 					}
+					else if (source.lookAhead("-", true)) {//deleted
+						setState(inDeleted);
+						return null;
+					}
 					else {
 						// Normal wikitext
 						source.nextWhileMatches(/[^\n\[{<']/);
@@ -95,7 +99,6 @@
 					break;
 				default:
 					// Normal wikitext
-					source.inPlugin = null;
 					source.nextWhileMatches(/[^\n\[{<']/);
 					return "tw-text";
 					break;
@@ -121,6 +124,8 @@
 					break;
 				}
 			}
+			
+			setState(normal);
 			return "tw-bold";
 		}
 		
@@ -132,6 +137,8 @@
 					break;
 				}
 			}
+			
+			setState(normal);
 			return "tw-italic";
 		}
 		
@@ -184,9 +191,28 @@
 					break;
 				}
 			}
+			
+			setState(normal);
 			return "tw-titlebar";
 		}
 		
+		function inDeleted(source, setState) {
+			while (!source.endOfLine()) {
+				var ch = source.next();
+				if (ch == "-" && source.lookAhead("-", true)) {
+					if (source.endOfLine()) {
+						setState(normal);
+						break;
+					}
+					setState(normal);
+					break;
+				}
+			}
+			
+			setState(normal);
+			return "tw-deleted";
+		}
+		
 		function inHeader(source, setState) {
 			while (!source.endOfLine()) {
 				var ch = source.next();
@@ -195,6 +221,8 @@
 					break;
 				}
 			}
+			
+			setState(normal);
 			return "tw-header";
 		}
 		
@@ -217,20 +245,21 @@
 					break;
 				}
 			}
+			
+			setState(normal);
 			return "tw-center";
 		}
 		
 		function inPluginContainer(source, setState) {
-			var killStatus = false;
-			while (!source.endOfLine() && !killStatus) {
+			while (!source.endOfLine()) {
 				var ch = source.next();
 				if (ch == "}") {
 					setState(normal);
 					break;
 				} else if (source.lookAhead("(", true)) {
 					if (!source.lookAhead(")")) {
-						killStatus = true;
 						setState(inPluginAttributes);
+						break;
 					}
 				}
 			}
@@ -238,15 +267,14 @@
 		}
 		
 		function inPluginAttributes(source, setState) {
-			var killStatus = false;
-			while (!source.endOfLine() && !killStatus) {
+			while (!source.endOfLine()) {
 				var ch = source.next();
 				if (source.lookAhead(")")) {
 					setState(inPluginContainer);
 					break;
 				} else if (source.lookAhead("=")) {
-					killStatus = true;
 					setState(inPluginAttributeEquals);
+					break;
 				}
 			}
 			return "tw-plugin-attributes";
@@ -261,17 +289,17 @@
 		}
 		
 		function inPluginAttributeValue(source, setState) {
-			var killStatus = false;
-			while (!source.endOfLine() && !killStatus) {
+			while (!source.endOfLine()) {
 				var ch = source.next();
 				if (source.lookAhead(",")) {
-					killStatus = true;
 					setState(inPluginAttributes);
 					break;
 				} else if (source.lookAhead(")")) {
-						killStatus = true;
 					setState(inPluginContainer);
 					break;
+				} else if (source.lookAhead("\n")) {
+					setState(normal);
+					break;
 				}
 			}
 			return "tw-plugin-attribute-value";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.