Updated codemirror to v4.12.

Did a lot of cleanup to limit the size of the plugin.
I kept the emmet plugin.

applications/admin/static/codemirror/mode/haml/haml.js

@@ -1,5 +1,15 @@
-(function() {
-  "use strict";
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
 
   // full haml mode. This handled embeded ruby and html fragments too
   CodeMirror.defineMode("haml", function(config) {
@@ -65,7 +75,7 @@
       // donot handle --> as valid ruby, make it HTML close comment instead
       if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
         state.tokenize = ruby;
-        return null;
+        return state.tokenize(stream, state);
       }
 
       if (state.previousToken.style == "hamlTag" ||
@@ -73,10 +83,10 @@
           state.previousToken.style == "hamlAttribute") {
         if (ch == "(") {
           state.tokenize = rubyInQuote(")");
-          return null;
+          return state.tokenize(stream, state);
         } else if (ch == "{") {
           state.tokenize = rubyInQuote("}");
-          return null;
+          return state.tokenize(stream, state);
         }
       }
 
@@ -141,13 +151,9 @@
           style = null;
         }
         return style;
-      },
-
-      indent: function(state) {
-        return state.indented;
       }
     };
   }, "htmlmixed", "ruby");
 
   CodeMirror.defineMIME("text/x-haml", "haml");
-})();
+});

applications/admin/static/codemirror/mode/haml/index.html

@@ -13,12 +13,12 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>

applications/admin/static/codemirror/mode/haml/test.js

@@ -1,5 +1,8 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "haml");
+  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   // Requires at least one media query
@@ -28,7 +31,7 @@
      "[tag %a]([variable title][operator =][string \"test\"]){[atom :title] [operator =>] [string \"test\"]}");
 
   MT("htmlCode",
-     "[tag <h1>]Title[tag </h1>]");
+     "[tag&bracket <][tag h1][tag&bracket >]Title[tag&bracket </][tag h1][tag&bracket >]");
 
   MT("rubyBlock",
      "[operator =][variable-2 @item]");
@@ -50,9 +53,9 @@
       "  [comment -# this is a comment]",
       "     [comment and this is a comment too]",
       "  Date/Time",
-      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][variable now]",
+      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][property now]",
       "  [tag %strong=] [variable now]",
-      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][variable parse]([string \"December 31, 2006\"])",
+      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][property parse]([string \"December 31, 2006\"])",
       "     [operator =][string \"Happy\"]",
       "     [operator =][string \"Belated\"]",
       "     [operator =][string \"Birthday\"]");