Update modes to use new embed syntax

lib/ace/mode/html.js

@@ -43,56 +43,33 @@ var JavaScriptMode = require("ace/mode/javascript").Mode;
 var CssMode = require("ace/mode/css").Mode;
 var Tokenizer = require("ace/tokenizer").Tokenizer;
 var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
+var XmlBehaviour = require("ace/mode/behaviour/xml").XmlBehaviour;
 
 var Mode = function() {
-    this.$tokenizer = new Tokenizer(new HtmlHighlightRules().getRules());
-
-    this.$js = new JavaScriptMode();
-    this.$css = new CssMode();
+    var highlighter = new HtmlHighlightRules();
+    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$behaviour = new XmlBehaviour();
+    
+    this.$embeds = highlighter.getEmbeds();
+    this.createModeDelegates({
+      "js-": JavaScriptMode,
+      "css-": CssMode
+    });
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
 
     this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        this.$delegate("toggleCommentLines", arguments, function() {
-            return 0;
-        });
+        return 0;
     };
 
     this.getNextLineIndent = function(state, line, tab) {
-        var self = this;
-        return this.$delegate("getNextLineIndent", arguments, function() {
-            return self.$getIndent(line);
-        });
+        return this.$getIndent(line);
     };
 
     this.checkOutdent = function(state, line, input) {
-        return this.$delegate("checkOutdent", arguments, function() {
-            return false;
-        });
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$delegate("autoOutdent", arguments);
-    };
-
-    this.$delegate = function(method, args, defaultHandler) {
-        var state = args[0];
-        var split = state.split("js-");
-
-        if (!split[0] && split[1]) {
-            args[0] = split[1];
-            return this.$js[method].apply(this.$js, args);
-        }
-
-        var split = state.split("css-");
-        if (!split[0] && split[1]) {
-            args[0] = split[1];
-            return this.$css[method].apply(this.$css, args);
-        }
-        
-        return defaultHandler ? defaultHandler() : undefined;
+        return false;
     };
 
 }).call(Mode.prototype);