diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 8007c8eb..a8cf3e68 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -230,7 +230,7 @@ function buildAce(aceProject, options) {
"css", "html", "javascript", "php", "coldfusion", "python", "lua", "xml", "ruby", "java", "c_cpp",
"coffee", "perl", "csharp", "haxe", "liquid", "svg", "clojure", "scss", "json", "groovy",
"ocaml", "scala", "textile", "scad", "markdown", "latex", "powershell", "sql",
- "text", "pgsql", "sh", "xquery", "less", "golang", "c9search"
+ "text", "pgsql", "sh", "xquery", "less", "golang", "c9search", "yaml"
],
themes: [
"chrome", "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn",
diff --git a/api/ace.html b/api/ace.html
index f917c97b..555ad9ff 100644
--- a/api/ace.html
+++ b/api/ace.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/anchor.html b/api/anchor.html
index b886f630..4b8d347d 100644
--- a/api/anchor.html
+++ b/api/anchor.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/background_tokenizer.html b/api/background_tokenizer.html
index 5380ec80..f1d0637c 100644
--- a/api/background_tokenizer.html
+++ b/api/background_tokenizer.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/document.html b/api/document.html
index ca7de45b..c6a162ee 100644
--- a/api/document.html
+++ b/api/document.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/edit_session.html b/api/edit_session.html
index e092110a..b5536b53 100644
--- a/api/edit_session.html
+++ b/api/edit_session.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/editor.html b/api/editor.html
index e2569cc9..c5725498 100644
--- a/api/editor.html
+++ b/api/editor.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/index.html b/api/index.html
index 6696b726..e1572a3a 100644
--- a/api/index.html
+++ b/api/index.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/multi_select.html b/api/multi_select.html
index 7d1db650..49be8126 100644
--- a/api/multi_select.html
+++ b/api/multi_select.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/placeholder.html b/api/placeholder.html
index 00cd688f..661efe05 100644
--- a/api/placeholder.html
+++ b/api/placeholder.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/range.html b/api/range.html
index 0e1690b9..b00a1b67 100644
--- a/api/range.html
+++ b/api/range.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css
index eed01b4e..b703b26b 100644
--- a/api/resources/csses/ace_api.css
+++ b/api/resources/csses/ace_api.css
@@ -132,28 +132,6 @@ blockquote p{
left: 210px;
}
-.masthead {
- background: #101010 url(../images/dashed_back.png) repeat 0 0;
-}
-.masthead .container {
- /*width: 680px;*/
- padding-left: 285px;
- margin: 0 auto;
- color: white;
-}
-.jumbotron {
- min-width: 1000px;
- padding-top: 40px;
- position: relative;
-}
-
-.jumbotron .inner {
-/* background: transparent url(../images/header-back.png) top center;*/
- padding: 45px 0;
-/* -webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
- -moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
-}
-
.headerTitle {
position: relative;
top: 100px;
@@ -545,10 +523,6 @@ header.filler {
margin-left: 30px;
}
-#mainContent .hero-unit {
- background: rgba(255, 255, 255, 0.5);
-}
-
#documentation {
padding-bottom: 10px;
}
@@ -688,6 +662,7 @@ li.signature {
.signature-call {
cursor: pointer;
}
+
.signature-call a {
color: #8e487e;
}
@@ -777,8 +752,6 @@ li.signature {
.table-striped tbody tr:nth-child(even) td, .table-striped tbody tr:nth-child(even) th {
background-color: #fbfbfb;
}
-.table-striped tbody tr:hover td, .table-striped tbody tr:hover th {
-}
.argument-list {
margin-bottom : 13px;
diff --git a/api/resources/javascripts/ga.js b/api/resources/javascripts/ga.js
index f0035835..e381972d 100644
--- a/api/resources/javascripts/ga.js
+++ b/api/resources/javascripts/ga.js
@@ -1,5 +1,5 @@
var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-18736001-1']);
+ _gaq.push(['_setAccount', 'UA-31998201-1']);
_gaq.push(['_trackPageview']);
(function() {
diff --git a/api/resources/javascripts/ux.js b/api/resources/javascripts/ux.js
index 49557601..53e6c0fe 100644
--- a/api/resources/javascripts/ux.js
+++ b/api/resources/javascripts/ux.js
@@ -52,7 +52,6 @@ $(function () {
// init prettyprint
$('pre > code').addClass('prettyprint');
prettyPrint();
-
});
$(document).ready(function () {
diff --git a/api/scrollbar.html b/api/scrollbar.html
index 75249b08..917b5279 100644
--- a/api/scrollbar.html
+++ b/api/scrollbar.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/search.html b/api/search.html
index f604715a..80a9656b 100644
--- a/api/search.html
+++ b/api/search.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/selection.html b/api/selection.html
index 77553b89..1fbd7a4e 100644
--- a/api/selection.html
+++ b/api/selection.html
@@ -1,6 +1,6 @@
-
-
+
+
@@ -112,7 +112,7 @@
Functions (45)
isMultiLine
- mergeOverlappingRanges
+ mergeOverlappingRanges
moveCursorBy
@@ -160,9 +160,9 @@
moveCursorUp
- rectangularRangeBlock
+ rectangularRangeBlock
- substractPoint
+ substractPoint
selectAll
diff --git a/api/split.html b/api/split.html
index 8da39ff9..627098e9 100644
--- a/api/split.html
+++ b/api/split.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/token_iterator.html b/api/token_iterator.html
index 5be0fdd2..12b98e2c 100644
--- a/api/token_iterator.html
+++ b/api/token_iterator.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/tokenizer.html b/api/tokenizer.html
index eb1c4f75..5edee492 100644
--- a/api/tokenizer.html
+++ b/api/tokenizer.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/undefined.html b/api/undefined.html
index 6c9e7a6d..2bbf48ed 100644
--- a/api/undefined.html
+++ b/api/undefined.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/undomanager.html b/api/undomanager.html
index 8312e9e4..4dd88f90 100644
--- a/api/undomanager.html
+++ b/api/undomanager.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/api/virtual_renderer.html b/api/virtual_renderer.html
index 219a07c2..d86e0193 100644
--- a/api/virtual_renderer.html
+++ b/api/virtual_renderer.html
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index a0f98e1f..d1453b5a 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -106,6 +106,7 @@ var modes = [
new Mode("liquid", "Liquid", ["liquid"]),
new Mode("markdown", "Markdown", ["md", "markdown"]),
new Mode("ocaml", "OCaml", ["ml", "mli"]),
+ new Mode("scad", "OpenSCAD", ["scad"]),
new Mode("perl", "Perl", ["pl", "pm"]),
new Mode("pgsql", "pgSQL", ["pgsql", "sql"]),
new Mode("php", "PHP", ["php"]),
@@ -120,7 +121,8 @@ var modes = [
new Mode("textile", "Textile", ["textile"]),
new Mode("xml", "XML", ["xml"]),
new Mode("sh", "SH", ["sh"]),
- new Mode("xquery", "XQuery", ["xq"])
+ new Mode("xquery", "XQuery", ["xq"]),
+ new Mode("yaml", "YAML", ["yaml"])
];
modesByName = {};
@@ -167,6 +169,10 @@ var docs = [
"xml", "XML",
require("ace/requirejs/text!./docs/xml.xml")
),
+ new Doc(
+ "yaml", "YAML",
+ require("ace/requirejs/text!./docs/yaml.yaml")
+ ),
new Doc(
"svg", "SVG",
require("ace/requirejs/text!./docs/svg.svg")
@@ -219,6 +225,10 @@ var docs = [
"scala", "Scala",
require("ace/requirejs/text!./docs/scala.scala")
),
+ new Doc(
+ "scad", "OpenSCAD",
+ require("ace/requirejs/text!./docs/OpenSCAD.scad")
+ ),
new Doc(
"csharp", "C#",
require("ace/requirejs/text!./docs/csharp.cs")
@@ -416,8 +426,8 @@ themeEl.updateTheme = function(){
bindDropdown("theme", function(value) {
if (!value)
return;
- env.editor.setTheme(value);
- themeEl.selectedValue = value;
+ env.editor.setTheme(value);
+ themeEl.selectedValue = value;
});
bindDropdown("keybinding", function(value) {
diff --git a/demo/kitchen-sink/docs/OpenSCAD.scad b/demo/kitchen-sink/docs/OpenSCAD.scad
new file mode 100644
index 00000000..a45c1aec
--- /dev/null
+++ b/demo/kitchen-sink/docs/OpenSCAD.scad
@@ -0,0 +1,21 @@
+// ace can highlight scad!
+module Element(xpos, ypos, zpos){
+ translate([xpos,ypos,zpos]){
+ union(){
+ cube([10,10,4],true);
+ cylinder(10,15,5);
+ translate([0,0,10])sphere(5);
+ }
+ }
+}
+
+union(){
+ for(i=[0:30]){
+ # Element(0,0,0);
+ Element(15*i,0,0);
+ }
+}
+
+for (i = [3, 5, 7, 11]){
+ rotate([i*10,0,0])scale([1,1,i])cube(10);
+}
\ No newline at end of file
diff --git a/demo/kitchen-sink/docs/yaml.yaml b/demo/kitchen-sink/docs/yaml.yaml
new file mode 100644
index 00000000..52ee320e
--- /dev/null
+++ b/demo/kitchen-sink/docs/yaml.yaml
@@ -0,0 +1,35 @@
+# This sample document was taken from wikipedia:
+# http://en.wikipedia.org/wiki/YAML#Sample_document
+---
+receipt: Oz-Ware Purchase Invoice
+date: 2007-08-06
+customer:
+ given: Dorothy
+ family: Gale
+
+items:
+ - part_no: 'A4786'
+ descrip: Water Bucket (Filled)
+ price: 1.47
+ quantity: 4
+
+ - part_no: 'E1628'
+ descrip: High Heeled "Ruby" Slippers
+ size: 8
+ price: 100.27
+ quantity: 1
+
+bill-to: &id001
+ street: |
+ 123 Tornado Alley
+ Suite 16
+ city: East Centerville
+ state: KS
+
+ship-to: *id001
+
+specialDelivery: >
+ Follow the Yellow Brick
+ Road to the Emerald City.
+ Pay no attention to the
+ man behind the curtain.
diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css
index eed01b4e..b703b26b 100644
--- a/doc/resources/ace/skeleton/csses/ace_api.css
+++ b/doc/resources/ace/skeleton/csses/ace_api.css
@@ -132,28 +132,6 @@ blockquote p{
left: 210px;
}
-.masthead {
- background: #101010 url(../images/dashed_back.png) repeat 0 0;
-}
-.masthead .container {
- /*width: 680px;*/
- padding-left: 285px;
- margin: 0 auto;
- color: white;
-}
-.jumbotron {
- min-width: 1000px;
- padding-top: 40px;
- position: relative;
-}
-
-.jumbotron .inner {
-/* background: transparent url(../images/header-back.png) top center;*/
- padding: 45px 0;
-/* -webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
- -moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
-}
-
.headerTitle {
position: relative;
top: 100px;
@@ -545,10 +523,6 @@ header.filler {
margin-left: 30px;
}
-#mainContent .hero-unit {
- background: rgba(255, 255, 255, 0.5);
-}
-
#documentation {
padding-bottom: 10px;
}
@@ -688,6 +662,7 @@ li.signature {
.signature-call {
cursor: pointer;
}
+
.signature-call a {
color: #8e487e;
}
@@ -777,8 +752,6 @@ li.signature {
.table-striped tbody tr:nth-child(even) td, .table-striped tbody tr:nth-child(even) th {
background-color: #fbfbfb;
}
-.table-striped tbody tr:hover td, .table-striped tbody tr:hover th {
-}
.argument-list {
margin-bottom : 13px;
diff --git a/doc/resources/ace/skeleton/javascripts/ga.js b/doc/resources/ace/skeleton/javascripts/ga.js
index f0035835..e381972d 100644
--- a/doc/resources/ace/skeleton/javascripts/ga.js
+++ b/doc/resources/ace/skeleton/javascripts/ga.js
@@ -1,5 +1,5 @@
var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-18736001-1']);
+ _gaq.push(['_setAccount', 'UA-31998201-1']);
_gaq.push(['_trackPageview']);
(function() {
diff --git a/doc/resources/ace/skeleton/javascripts/ux.js b/doc/resources/ace/skeleton/javascripts/ux.js
index 49557601..53e6c0fe 100644
--- a/doc/resources/ace/skeleton/javascripts/ux.js
+++ b/doc/resources/ace/skeleton/javascripts/ux.js
@@ -52,7 +52,6 @@ $(function () {
// init prettyprint
$('pre > code').addClass('prettyprint');
prettyPrint();
-
});
$(document).ready(function () {
diff --git a/doc/resources/ace/templates/layout.jade b/doc/resources/ace/templates/layout.jade
index c241535e..86177487 100644
--- a/doc/resources/ace/templates/layout.jade
+++ b/doc/resources/ace/templates/layout.jade
@@ -1,11 +1,7 @@
include ../../common_layout
include lib
-!!! 5
-
-
-
-
+mixin doctype
html(xmlns="http://www.w3.org/1999/xhtml")
head
diff --git a/doc/resources/ace/templates/lib.jade b/doc/resources/ace/templates/lib.jade
index ca9b277f..0f443974 100644
--- a/doc/resources/ace/templates/lib.jade
+++ b/doc/resources/ace/templates/lib.jade
@@ -159,7 +159,6 @@ mixin article(obj, parents)
h4 Arguments
!= argumentTable(obj.arguments, ["argument-list", "table", "table-striped", "table-bordered"])
-
if obj.retDesc
h4 Returns
!= returnTable(obj.retDesc, ["return-list", "table", "table-striped", "table-bordered"])
diff --git a/doc/resources/common_layout.jade b/doc/resources/common_layout.jade
index 1a96a537..39d76600 100644
--- a/doc/resources/common_layout.jade
+++ b/doc/resources/common_layout.jade
@@ -39,6 +39,7 @@ mixin head
script(src="#{dirPrefix}resources/javascripts/bootstrap-dropdown.js")
script(src="#{dirPrefix}resources/javascripts/jquery-scrollspy.js")
script(script src="#{dirPrefix}resources/javascripts/prettify-extension.js")
+
mixin navBar
div.navbar.navbar-fixed-top
div.navbar-inner
@@ -55,10 +56,10 @@ mixin navBar
mixin footer
div#footer
- .footerInner
- .footer-text.pull-right
- p
- About Cloud9 | Ace & Cloud9 IDE are © Ajax.org 2012
+ .footerInner
+ .footer-text.pull-right
+ p
+ About Cloud9 | Ace & Cloud9 IDE are © Ajax.org 2012
mixin endingScripts
// scripts concatenated and minified via ant build script
diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index e8eec1e9..b38dc453 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -1,4 +1,3 @@
-
.ace_editor {
position: absolute;
overflow: hidden;
@@ -37,8 +36,8 @@
.ace_gutter_active_line {
position: absolute;
+ left: 0;
right: 0;
- width: 100%;
}
.ace_scroller.horscroll {
@@ -129,6 +128,7 @@
.ace_gutter .ace_layer {
position: relative;
min-width: 40px;
+ width: auto;
text-align: right;
pointer-events: auto;
}
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index ac7c31ac..834e603a 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -509,8 +509,9 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine();
}
+ var self = this;
if (this.$highlightSelectedWord && !this.$wordHighlightTimer)
- this.$wordHighlightTimer = setTimeout(function(self) {
+ this.$wordHighlightTimer = setTimeout(function() {
self.session.$mode.highlightSelection(self);
self.$wordHighlightTimer = null;
}, 30, this);
diff --git a/lib/ace/mode/yaml.js b/lib/ace/mode/yaml.js
new file mode 100644
index 00000000..a252308e
--- /dev/null
+++ b/lib/ace/mode/yaml.js
@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* The Original Code is Ajax.org Code Editor (ACE).
+*
+* Contributor(s):
+* Meg Sharkey
+*
+* Alternatively, the contents of this file may be used under the terms of
+* either the GNU General Public License Version 2 or later (the "GPL"), or
+* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+* in which case the provisions of the GPL or the LGPL are applicable instead
+* of those above. If you wish to allow use of your version of this file only
+* under the terms of either the GPL or the LGPL, and not to allow others to
+* use your version of this file under the terms of the MPL, indicate your
+* decision by deleting the provisions above and replace them with the notice
+* and other provisions required by the GPL or the LGPL. If you do not delete
+* the provisions above, a recipient may use your version of this file under
+* the terms of any one of the MPL, the GPL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var YamlHighlightRules = require("./yaml_highlight_rules").YamlHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+
+var Mode = function() {
+ this.$tokenizer = new Tokenizer(new YamlHighlightRules().getRules());
+ this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+ this.getNextLineIndent = function(state, line, tab) {
+ var indent = this.$getIndent(line);
+
+ if (state == "start") {
+ var match = line.match(/^.*[\{\(\[]\s*$/);
+ if (match) {
+ indent += tab;
+ }
+ }
+
+ return indent;
+ };
+
+ this.checkOutdent = function(state, line, input) {
+ return this.$outdent.checkOutdent(line, input);
+ };
+
+ this.autoOutdent = function(state, doc, row) {
+ this.$outdent.autoOutdent(doc, row);
+ };
+
+
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
diff --git a/lib/ace/mode/yaml_highlight_rules.js b/lib/ace/mode/yaml_highlight_rules.js
new file mode 100644
index 00000000..faba4244
--- /dev/null
+++ b/lib/ace/mode/yaml_highlight_rules.js
@@ -0,0 +1,116 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Meg Sharkey
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var YamlHighlightRules = function() {
+
+ // regexp must not have capturing parentheses. Use (?:) instead.
+ // regexps are ordered -> the first match is used
+ this.$rules = {
+ "start" : [
+ {
+ token : "comment",
+ regex : "#.*$"
+ }, {
+ token : "comment",
+ regex : "^---"
+ }, {
+ token: "variable",
+ regex: "[&\\*][a-zA-Z0-9-_]+"
+ }, {
+ token: ["identifier", "text"],
+ regex: "(\\w+\\s*:)(\\w*)"
+ }, {
+ token : "keyword.operator",
+ regex : "<<\\w*:\\w*"
+ }, {
+ token : "keyword.operator",
+ regex : "-\\s*(?=[{])"
+ }, {
+ token : "string", // single line
+ regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+ }, {
+ token : "string", // multi line string start
+ merge : true,
+ regex : '[\\|>]\\w*',
+ next : "qqstring"
+ }, {
+ token : "string", // single quoted string
+ regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+ }, {
+ token : "constant.numeric", // float
+ regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+ }, {
+ token : "constant.language.boolean",
+ regex : "(?:true|false|yes|no)\\b"
+ }, {
+ token : "invalid.illegal", // comments are not allowed
+ regex : "\\/\\/.*$"
+ }, {
+ token : "paren.lparen",
+ regex : "[[({]"
+ }, {
+ token : "paren.rparen",
+ regex : "[\\])}]"
+ }, {
+ token : "text",
+ regex : "\\s+"
+ }
+ ],
+ "qqstring" : [
+ {
+ token : "string",
+ regex : '(?=(?:(?:\\\\.)|(?:[^:]))*?:)',
+ next : "start"
+ }, {
+ token : "string",
+ merge : true,
+ regex : '.+'
+ }
+ ]}
+
+};
+
+oop.inherits(YamlHighlightRules, TextHighlightRules);
+
+exports.YamlHighlightRules = YamlHighlightRules;
+});
diff --git a/lib/ace/theme/chrome.js b/lib/ace/theme/chrome.js
index 60fdf458..ae9f05da 100644
--- a/lib/ace/theme/chrome.js
+++ b/lib/ace/theme/chrome.js
@@ -52,11 +52,6 @@ exports.cssText = ".ace-chrome .ace_editor {\
overflow : hidden;\
}\
\
-.ace-chrome .ace_gutter-layer {\
- width: 100%;\
- text-align: right;\
-}\
-\
.ace-chrome .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js
index d38f0d5c..c0981537 100644
--- a/lib/ace/theme/crimson_editor.js
+++ b/lib/ace/theme/crimson_editor.js
@@ -46,7 +46,6 @@ exports.cssText = ".ace-crimson-editor .ace_editor {\
}\
\
.ace-crimson-editor .ace_gutter {\
- width: 50px;\
background: #e8e8e8;\
color: #333;\
overflow : hidden;\
@@ -57,10 +56,6 @@ exports.cssText = ".ace-crimson-editor .ace_editor {\
text-align: right;\
}\
\
-.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell {\
- padding-right: 6px;\
-}\
-\
.ace-crimson-editor .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 996315e8..363f3cd8 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -451,10 +451,6 @@ var VirtualRenderer = function(container, theme) {
this.$highlightGutterLine = false;
this.setHighlightGutterLine = function(shouldHighlight) {
- // adding this element to gutter causes strange behavior on ie
- if (useragent.isIE)
- return;
-
if (this.$highlightGutterLine == shouldHighlight)
return;
this.$highlightGutterLine = shouldHighlight;