codemirror-rails 2.32 → 2.33

data/vendor/assets/javascripts/codemirror/modes/markdown.js

@@ -38,6 +38,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.em = false;
     // Reset STRONG state
     state.strong = false;
+    // Reset state.quote
+    state.quote = false;
     if (!htmlFound && state.f == htmlBlock) {
       state.f = inlineNormal;
       state.block = blockNormal;
@@ -106,7 +108,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function inlineNormal(stream, state) {
-    var style = state.text(stream, state)
+    var style = state.text(stream, state);
     if (typeof style !== 'undefined')
       return style;
     
@@ -119,7 +121,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (ch === '`') {
       return switchInline(stream, state, inlineElement(code, '`'));
     }
-    if (ch === '[') {
+    if (ch === '[' && stream.match(/.*\](?:\(|\[)/, false)) {
       return switchInline(stream, state, linkText);
     }
     if (ch === '<' && stream.match(/^\w/, false)) {
@@ -246,8 +248,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         // Reset state.header
         state.header = false;
-        // Reset state.quote
-        state.quote = false;
 
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;

data/vendor/assets/javascripts/codemirror/modes/ntriples.js

@@ -27,7 +27,7 @@
 */
 CodeMirror.defineMode("ntriples", function() {  
 
-  Location = {
+  var Location = {
     PRE_SUBJECT         : 0,
     WRITING_SUB_URI     : 1,
     WRITING_BNODE_URI   : 2,
@@ -87,8 +87,8 @@ CodeMirror.defineMode("ntriples", function() {
     currState.location=ret;
   }
 
-  untilSpace  = function(c) { return c != ' '; };
-  untilEndURI = function(c) { return c != '>'; };
+  var untilSpace  = function(c) { return c != ' '; };
+  var untilEndURI = function(c) { return c != '>'; };
   return {
     startState: function() {
        return { 
@@ -114,7 +114,7 @@ CodeMirror.defineMode("ntriples", function() {
       }
       if(ch == '#') {
         var parsedAnchor = '';
-        stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false});
+        stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false;});
         state.anchors.push(parsedAnchor);
         return 'variable-2';
       }

data/vendor/assets/javascripts/codemirror/modes/ocaml.js

@@ -103,7 +103,7 @@ CodeMirror.defineMode('ocaml', function(config) {
   }
 
   return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0}},
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
       return state.tokenize(stream, state);

data/vendor/assets/javascripts/codemirror/modes/pascal.js

@@ -26,7 +26,7 @@ CodeMirror.defineMode("pascal", function(config) {
       return tokenComment(stream, state);
     }
     if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return null
+      return null;
     }
     if (/\d/.test(ch)) {
       stream.eatWhile(/[\w\.]/);

data/vendor/assets/javascripts/codemirror/modes/perl.js

@@ -477,22 +477,22 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 					if(chain[++i]!==undefined){
 						state.chain=chain[i];
 						state.style=style;
-						state.tail=tail}
+						state.tail=tail;}
 					else if(tail)
 						stream.eatWhile(tail);
 					state.tokenize=tokenPerl;
-					return style}
-				e=!e&&c=="\\"}
-			return style};
-		return state.tokenize(stream,state)}
+					return style;}
+				e=!e&&c=="\\";}
+			return style;};
+		return state.tokenize(stream,state);}
 
 	function tokenSOMETHING(stream,state,string){
 		state.tokenize=function(stream,state){
 			if(stream.string==string)
 				state.tokenize=tokenPerl;
 			stream.skipToEnd();
-			return "string"};
-		return state.tokenize(stream,state)}
+			return "string";};
+		return state.tokenize(stream,state);}
 
 	function tokenPerl(stream,state){
 		if(stream.eatSpace())
@@ -504,9 +504,9 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 				return 'number';
 		if(stream.match(/^<<(?=\w)/)){			// NOTE: <<SOMETHING\n...\nSOMETHING\n
 			stream.eatWhile(/\w/);
-			return tokenSOMETHING(stream,state,stream.current().substr(2))}
+			return tokenSOMETHING(stream,state,stream.current().substr(2));}
 		if(stream.sol()&&stream.match(/^\=item(?!\w)/)){// NOTE: \n=item...\n=cut\n
-			return tokenSOMETHING(stream,state,'=cut')}
+			return tokenSOMETHING(stream,state,'=cut');}
 		var ch=stream.next();
 		if(ch=='"'||ch=="'"){				// NOTE: ' or " or <<'SOMETHING'\n...\nSOMETHING\n or <<"SOMETHING"\n...\nSOMETHING\n
 			if(stream.prefix(3)=="<<"+ch){
@@ -515,8 +515,8 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 				var n=stream.current().substr(1);
 				if(n&&stream.eat(ch))
 					return tokenSOMETHING(stream,state,n);
-				stream.pos=p}
-			return tokenChain(stream,state,[ch],"string")}
+				stream.pos=p;}
+			return tokenChain(stream,state,[ch],"string");}
 		if(ch=="q"){
 			var c=stream.look(-2);
 			if(!(c&&/\w/.test(c))){
@@ -525,100 +525,100 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 					c=stream.look(1);
 					if(c=="("){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
 					if(c=="["){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
 					if(c=="{"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
 					if(c=="<"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
 					if(/[\^'"!~\/]/.test(c)){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers)}}
+						return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
 				else if(c=="q"){
 					c=stream.look(1);
 					if(c=="("){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[")"],"string")}
+						return tokenChain(stream,state,[")"],"string");}
 					if(c=="["){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["]"],"string")}
+						return tokenChain(stream,state,["]"],"string");}
 					if(c=="{"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["}"],"string")}
+						return tokenChain(stream,state,["}"],"string");}
 					if(c=="<"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[">"],"string")}
+						return tokenChain(stream,state,[">"],"string");}
 					if(/[\^'"!~\/]/.test(c)){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[stream.eat(c)],"string")}}
+						return tokenChain(stream,state,[stream.eat(c)],"string");}}
 				else if(c=="w"){
 					c=stream.look(1);
 					if(c=="("){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[")"],"bracket")}
+						return tokenChain(stream,state,[")"],"bracket");}
 					if(c=="["){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["]"],"bracket")}
+						return tokenChain(stream,state,["]"],"bracket");}
 					if(c=="{"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["}"],"bracket")}
+						return tokenChain(stream,state,["}"],"bracket");}
 					if(c=="<"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[">"],"bracket")}
+						return tokenChain(stream,state,[">"],"bracket");}
 					if(/[\^'"!~\/]/.test(c)){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[stream.eat(c)],"bracket")}}
+						return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
 				else if(c=="r"){
 					c=stream.look(1);
 					if(c=="("){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
 					if(c=="["){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
 					if(c=="{"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
 					if(c=="<"){
 						stream.eatSuffix(2);
-						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
 					if(/[\^'"!~\/]/.test(c)){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers)}}
+						return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
 				else if(/[\^'"!~\/(\[{<]/.test(c)){
 					if(c=="("){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[")"],"string")}
+						return tokenChain(stream,state,[")"],"string");}
 					if(c=="["){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,["]"],"string")}
+						return tokenChain(stream,state,["]"],"string");}
 					if(c=="{"){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,["}"],"string")}
+						return tokenChain(stream,state,["}"],"string");}
 					if(c=="<"){
 						stream.eatSuffix(1);
-						return tokenChain(stream,state,[">"],"string")}
+						return tokenChain(stream,state,[">"],"string");}
 					if(/[\^'"!~\/]/.test(c)){
-						return tokenChain(stream,state,[stream.eat(c)],"string")}}}}
+						return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
 		if(ch=="m"){
 			var c=stream.look(-2);
 			if(!(c&&/\w/.test(c))){
 				c=stream.eat(/[(\[{<\^'"!~\/]/);
 				if(c){
 					if(/[\^'"!~\/]/.test(c)){
-						return tokenChain(stream,state,[c],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[c],RXstyle,RXmodifiers);}
 					if(c=="("){
-						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
 					if(c=="["){
-						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
 					if(c=="{"){
-						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers)}
+						return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
 					if(c=="<"){
-						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers)}}}}
+						return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
 		if(ch=="s"){
 			var c=/[\/>\]})\w]/.test(stream.look(-2));
 			if(!c){
@@ -632,7 +632,7 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 						return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
 					if(c=="(")
 						return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers)}}}
+					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
 		if(ch=="y"){
 			var c=/[\/>\]})\w]/.test(stream.look(-2));
 			if(!c){
@@ -646,7 +646,7 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 						return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
 					if(c=="(")
 						return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers)}}}
+					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
 		if(ch=="t"){
 			var c=/[\/>\]})\w]/.test(stream.look(-2));
 			if(!c){
@@ -661,65 +661,65 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 						return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
 					if(c=="(")
 						return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers)}}}}
+					return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}}
 		if(ch=="`"){
-			return tokenChain(stream,state,[ch],"variable-2")}
+			return tokenChain(stream,state,[ch],"variable-2");}
 		if(ch=="/"){
 			if(!/~\s*$/.test(stream.prefix()))
 				return "operator";
 			else
-				return tokenChain(stream,state,[ch],RXstyle,RXmodifiers)}
+				return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
 		if(ch=="$"){
 			var p=stream.pos;
 			if(stream.eatWhile(/\d/)||stream.eat("{")&&stream.eatWhile(/\d/)&&stream.eat("}"))
 				return "variable-2";
 			else
-				stream.pos=p}
+				stream.pos=p;}
 		if(/[$@%]/.test(ch)){
 			var p=stream.pos;
 			if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(stream.look(-2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
 				var c=stream.current();
 				if(PERL[c])
-					return "variable-2"}
-			stream.pos=p}
+					return "variable-2";}
+			stream.pos=p;}
 		if(/[$@%&]/.test(ch)){
 			if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){
 				var c=stream.current();
 				if(PERL[c])
 					return "variable-2";
 				else
-					return "variable"}}
+					return "variable";}}
 		if(ch=="#"){
 			if(stream.look(-2)!="$"){
 				stream.skipToEnd();
-				return "comment"}}
+				return "comment";}}
 		if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
 			var p=stream.pos;
 			stream.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/);
 			if(PERL[stream.current()])
 				return "operator";
 			else
-				stream.pos=p}
+				stream.pos=p;}
 		if(ch=="_"){
 			if(stream.pos==1){
 				if(stream.suffix(6)=="_END__"){
-					return tokenChain(stream,state,['\0'],"comment")}
+					return tokenChain(stream,state,['\0'],"comment");}
 				else if(stream.suffix(7)=="_DATA__"){
-					return tokenChain(stream,state,['\0'],"variable-2")}
+					return tokenChain(stream,state,['\0'],"variable-2");}
 				else if(stream.suffix(7)=="_C__"){
-					return tokenChain(stream,state,['\0'],"string")}}}
+					return tokenChain(stream,state,['\0'],"string");}}}
 		if(/\w/.test(ch)){
 			var p=stream.pos;
 			if(stream.look(-2)=="{"&&(stream.look(0)=="}"||stream.eatWhile(/\w/)&&stream.look(0)=="}"))
 				return "string";
 			else
-				stream.pos=p}
+				stream.pos=p;}
 		if(/[A-Z]/.test(ch)){
 			var l=stream.look(-2);
 			var p=stream.pos;
 			stream.eatWhile(/[A-Z_]/);
 			if(/[\da-z]/.test(stream.look(0))){
-				stream.pos=p}
+				stream.pos=p;}
 			else{
 				var c=PERL[stream.current()];
 				if(!c)
@@ -738,9 +738,9 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 					else if(c==5)
 						return "variable-2";
 					else
-						return "meta"}
+						return "meta";}
 				else
-					return "meta"}}
+					return "meta";}}
 		if(/[a-zA-Z_]/.test(ch)){
 			var l=stream.look(-2);
 			stream.eatWhile(/\w/);
@@ -761,10 +761,10 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 				else if(c==5)
 					return "variable-2";
 				else
-					return "meta"}
+					return "meta";}
 			else
-				return "meta"}
-		return null}
+				return "meta";}
+		return null;}
 
 	return{
 		startState:function(){
@@ -772,37 +772,37 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 				tokenize:tokenPerl,
 				chain:null,
 				style:null,
-				tail:null}},
+				tail:null};},
 		token:function(stream,state){
-			return (state.tokenize||tokenPerl)(stream,state)},
-		electricChars:"{}"}});
+			return (state.tokenize||tokenPerl)(stream,state);},
+		electricChars:"{}"};});
 
 CodeMirror.defineMIME("text/x-perl", "perl");
 
 // it's like "peek", but need for look-ahead or look-behind if index < 0
 CodeMirror.StringStream.prototype.look=function(c){
-	return this.string.charAt(this.pos+(c||0))};
+	return this.string.charAt(this.pos+(c||0));};
 
 // return a part of prefix of current stream from current position
 CodeMirror.StringStream.prototype.prefix=function(c){
 	if(c){
 		var x=this.pos-c;
-		return this.string.substr((x>=0?x:0),c)}
+		return this.string.substr((x>=0?x:0),c);}
 	else{
-		return this.string.substr(0,this.pos-1)}};
+		return this.string.substr(0,this.pos-1);}};
 
 // return a part of suffix of current stream from current position
 CodeMirror.StringStream.prototype.suffix=function(c){
 	var y=this.string.length;
 	var x=y-this.pos+1;
-	return this.string.substr(this.pos,(c&&c<y?c:x))};
+	return this.string.substr(this.pos,(c&&c<y?c:x));};
 
 // return a part of suffix of current stream from current position and change current position
 CodeMirror.StringStream.prototype.nsuffix=function(c){
 	var p=this.pos;
 	var l=c||(this.string.length-this.pos+1);
 	this.pos+=l;
-	return this.string.substr(p,l)};
+	return this.string.substr(p,l);};
 
 // eating and vomiting a part of stream from current position
 CodeMirror.StringStream.prototype.eatSuffix=function(c){
@@ -813,4 +813,4 @@ CodeMirror.StringStream.prototype.eatSuffix=function(c){
 	else if(x>=(y=this.string.length-1))
 		this.pos=y;
 	else
-		this.pos=x};
+		this.pos=x;};

data/vendor/assets/javascripts/codemirror/modes/php.js

@@ -9,7 +9,7 @@
       if (stream.match(delim)) state.tokenize = null;
       else stream.skipToEnd();
       return "string";
-    }
+    };
   }
   var phpConfig = {
     name: "clike",
@@ -118,7 +118,7 @@
                 curState: parserConfig.startOpen ? phpMode.startState() : html,
                 curClose: parserConfig.startOpen ? /^\?>/ : null,
 		mode: parserConfig.startOpen ? "php" : "html",
-                pending: null}
+                pending: null};
       },
 
       copyState: function(state) {
@@ -142,7 +142,7 @@
       },
 
       electricChars: "/{}:"
-    }
+    };
   }, "xml", "clike", "javascript", "css");
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});