package

build/demo/kitchen-sink/kitchen-sink-uncompressed.js

@@ -6232,7 +6232,7 @@ var Tokenizer = function(rules) {
                     }
                     break;
                 }
-            };
+            }
 
             if (value[0]) {
                 if (typeof type == "string") {
@@ -6250,7 +6250,7 @@ var Tokenizer = function(rules) {
                         token = {
                             type: type[i],
                             value: value[i]
-                        }
+                        };
                     }
                 }
             }
@@ -6259,7 +6259,7 @@ var Tokenizer = function(rules) {
                 break;
             
             lastIndex = re.lastIndex;
-        };
+        }
 
         if (token.type)
             tokens.push(token);
@@ -14213,7 +14213,7 @@ var XmlHighlightRules = function() {
         }, {
             token : "string", // multi line string start
             merge : true,
-            regex : '["].*$',
+            regex : '["].*',
             next : "qqstring"
         }, {
             token : "string",
@@ -14221,13 +14221,13 @@ var XmlHighlightRules = function() {
         }, {
             token : "string", // multi line string start
             merge : true,
-            regex : "['].*$",
+            regex : "['].*",
             next : "qstring"
         }],
 
         qstring: [{
             token : "string",
-            regex : ".*'",
+            regex : ".*?'",
             next : "tag"
         }, {
             token : "string",
@@ -14237,7 +14237,7 @@ var XmlHighlightRules = function() {
         
         qqstring: [{
             token : "string",
-            regex : ".*\"",
+            regex : ".*?\"",
             next : "tag"
         }, {
             token : "string",

build/kitchen-sink.html

@@ -11,7 +11,7 @@
     
     Ace
       version 0.2.0
-      commit  2b4351ccd7efe07b220e99de11e9b451dc2e478c
+      commit  1a42d8e2b080b6676ff7701ad8b11cd12ed0c1b0
 
     
     -->
@@ -189,7 +189,7 @@
 <!-- 
   <script type="text/javascript">
       var require = {
-          baseUrl: "/" + window.location.pathname.split("/").slice(0, -1).join("/"),
+          baseUrl: window.location.protocol + "//" + window.location.host + window.location.pathname.split("/").slice(0, -1).join("/"),
           paths: {
               ace: "lib/ace"
           }

build/src/ace-uncompressed.js

@@ -8117,7 +8117,7 @@ var Tokenizer = function(rules) {
                     }
                     break;
                 }
-            };
+            }
 
             if (value[0]) {
                 if (typeof type == "string") {
@@ -8135,7 +8135,7 @@ var Tokenizer = function(rules) {
                         token = {
                             type: type[i],
                             value: value[i]
-                        }
+                        };
                     }
                 }
             }
@@ -8144,7 +8144,7 @@ var Tokenizer = function(rules) {
                 break;
             
             lastIndex = re.lastIndex;
-        };
+        }
 
         if (token.type)
             tokens.push(token);

build/textarea/src/ace-uncompressed.js

@@ -1903,9 +1903,9 @@ exports.addMouseWheelListener = function(el, callback) {
                 max = Math.abs(e.wheelDeltaY)
 
             if (max > 5000)
-                factor = 400;
+                var factor = 400;
             else
-                factor = 8;
+                var factor = 8;
 
             if (e.wheelDeltaX !== undefined) {
                 e.wheelX = -e.wheelDeltaX / factor;
@@ -1979,7 +1979,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
                 break;
             case "Shift":
                 hashId = 4;
-                break
+                break;
             case "Ctrl":
                 hashId = 1;
                 break;
@@ -2041,6 +2041,28 @@ exports.addCommandKeyListener = function(el, callback) {
     }
 };
 
+if (window.postMessage) {
+    var postMessageId = 1;
+    this.nextTick = function(callback, win) {
+        win = win || window;
+        var messageName = "zero-timeout-message-" + postMessageId;            
+        exports.addListener(win, "message", function listener(e) {
+            if (e.data == messageName) {
+                exports.stopPropagation(e);
+                exports.removeListener(win, "message", listener);
+                callback();
+            }
+        });
+        win.postMessage(messageName, "*");
+    };
+}
+else {
+    this.nextTick = function(callback, win) {
+        win = win || window;
+        window.setTimeout(callback, 0);
+    };
+}
+
 });
 /*! @license
 ==========================================================================
@@ -8049,7 +8071,7 @@ var Tokenizer = function(rules) {
                     }
                     break;
                 }
-            };
+            }
 
             if (value[0]) {
                 if (typeof type == "string") {
@@ -8067,7 +8089,7 @@ var Tokenizer = function(rules) {
                         token = {
                             type: type[i],
                             value: value[i]
-                        }
+                        };
                     }
                 }
             }
@@ -8076,7 +8098,7 @@ var Tokenizer = function(rules) {
                 break;
             
             lastIndex = re.lastIndex;
-        };
+        }
 
         if (token.type)
             tokens.push(token);
@@ -13113,11 +13135,11 @@ __ace_shadowed__.define('ace/renderloop', ['require', 'exports', 'module' , 'ace
 
 var event = require("./lib/event");
 
-var RenderLoop = function(onRender, window) {
+var RenderLoop = function(onRender, win) {
     this.onRender = onRender;
     this.pending = false;
     this.changes = 0;
-    this.setTimeoutZero = this.setTimeoutZero.bind(window);
+    this.window = win || window;
 };
 
 (function() {
@@ -13129,40 +13151,15 @@ var RenderLoop = function(onRender, window) {
         if (!this.pending) {
             this.pending = true;
             var _self = this;
-            this.setTimeoutZero(function() {
+            event.nextTick(function() {
                 _self.pending = false;
                 var changes = _self.changes;
                 _self.changes = 0;
                 _self.onRender(changes);
-            });
+            }, this.window);
         }
     };
 
-    if (window.postMessage) {
-        this.setTimeoutZero = (function(messageName, attached, listener) {
-            return function setTimeoutZero(callback) {
-                // Set up listener if not listening already.
-                if (!attached) {
-                    event.addListener(this, "message", function(e) {
-                        if (listener && e.data == messageName) {
-                            event.stopPropagation(e);
-                            listener();
-                        }
-                    });
-                    attached = true;
-                }
-
-                listener = callback;
-                this.postMessage(messageName, "*");
-            };
-        })("zero-timeout-message", false, null);
-    }
-    else {
-        this.setTimeoutZero = function(callback) {
-            this.setTimeout(callback, 0);
-        };
-    }
-
 }).call(RenderLoop.prototype);
 
 exports.RenderLoop = RenderLoop;