This commit is contained in:
William Candillon 2012-05-24 17:35:11 +02:00
commit f718f2c4b8
39 changed files with 306 additions and 133 deletions

View file

@ -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",

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -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;

View file

@ -1,5 +1,5 @@
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18736001-1']);
_gaq.push(['_setAccount', 'UA-31998201-1']);
_gaq.push(['_trackPageview']);
(function() {

View file

@ -52,7 +52,6 @@ $(function () {
// init prettyprint
$('pre > code').addClass('prettyprint');
prettyPrint();
});
$(document).ready(function () {

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -112,7 +112,7 @@
</li>
<li data-dropdown="dropdown" class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle"><span>Functions (45)</span><b class="caret"></b></a>
<ul class="dropdown-menu">
<li data-id="Selection.addRange" class="memberLink"><a href="multi_select.html#Selection.addRange" class="" title="Selection.addRange (class method)" data-id="Selection.addRange">addRange</a>
<li data-id="Selection.addRange" class="memberLink"><a href="#Selection.addRange" class="" title="Selection.addRange (class method)" data-id="Selection.addRange">addRange</a>
</li>
<li data-id="Selection.clearSelection" class="memberLink"><a href="#Selection.clearSelection" class="" title="Selection.clearSelection (class method)" data-id="Selection.clearSelection">clearSelection</a>
</li>
@ -130,7 +130,7 @@
</li>
<li data-id="Selection.isMultiLine" class="memberLink"><a href="#Selection.isMultiLine" class="" title="Selection.isMultiLine (class method)" data-id="Selection.isMultiLine">isMultiLine</a>
</li>
<li data-id="Selection.mergeOverlappingRanges" class="memberLink"><a href="multi_select.html#Selection.mergeOverlappingRanges" class="" title="Selection.mergeOverlappingRanges (class method)" data-id="Selection.mergeOverlappingRanges">mergeOverlappingRanges</a>
<li data-id="Selection.mergeOverlappingRanges" class="memberLink"><a href="#Selection.mergeOverlappingRanges" class="" title="Selection.mergeOverlappingRanges (class method)" data-id="Selection.mergeOverlappingRanges">mergeOverlappingRanges</a>
</li>
<li data-id="Selection.moveCursorBy" class="memberLink"><a href="#Selection.moveCursorBy" class="" title="Selection.moveCursorBy (class method)" data-id="Selection.moveCursorBy">moveCursorBy</a>
</li>
@ -160,9 +160,9 @@
</li>
<li data-id="Selection.moveCursorUp" class="memberLink"><a href="#Selection.moveCursorUp" class="" title="Selection.moveCursorUp (class method)" data-id="Selection.moveCursorUp">moveCursorUp</a>
</li>
<li data-id="Selection.rectangularRangeBlock" class="memberLink"><a href="multi_select.html#Selection.rectangularRangeBlock" class="" title="Selection.rectangularRangeBlock (class method)" data-id="Selection.rectangularRangeBlock">rectangularRangeBlock</a>
<li data-id="Selection.rectangularRangeBlock" class="memberLink"><a href="#Selection.rectangularRangeBlock" class="" title="Selection.rectangularRangeBlock (class method)" data-id="Selection.rectangularRangeBlock">rectangularRangeBlock</a>
</li>
<li data-id="Selection.substractPoint" class="memberLink"><a href="multi_select.html#Selection.substractPoint" class="" title="Selection.substractPoint (class method)" data-id="Selection.substractPoint">substractPoint</a>
<li data-id="Selection.substractPoint" class="memberLink"><a href="#Selection.substractPoint" class="" title="Selection.substractPoint (class method)" data-id="Selection.substractPoint">substractPoint</a>
</li>
<li data-id="Selection.selectAll" class="memberLink"><a href="#Selection.selectAll" class="" title="Selection.selectAll (class method)" data-id="Selection.selectAll">selectAll</a>
</li>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -1,6 +1,6 @@
<!DOCTYPE html><!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

View file

@ -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) {

View file

@ -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);
}

View file

@ -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.

View file

@ -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;

View file

@ -1,5 +1,5 @@
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18736001-1']);
_gaq.push(['_setAccount', 'UA-31998201-1']);
_gaq.push(['_trackPageview']);
(function() {

View file

@ -52,7 +52,6 @@ $(function () {
// init prettyprint
$('pre > code').addClass('prettyprint');
prettyPrint();
});
$(document).ready(function () {

View file

@ -1,11 +1,7 @@
include ../../common_layout
include lib
!!! 5
<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
mixin doctype
html(xmlns="http://www.w3.org/1999/xhtml")
head

View file

@ -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"])

View file

@ -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
<a href="http://www.c9.io">About Cloud9</a> | Ace & Cloud9 IDE are &copy; <a href="http://ajax.org">Ajax.org</a> 2012
.footerInner
.footer-text.pull-right
p
<a href="http://www.c9.io">About Cloud9</a> | Ace & Cloud9 IDE are &copy; <a href="http://ajax.org">Ajax.org</a> 2012
mixin endingScripts
// scripts concatenated and minified via ant build script

View file

@ -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;
}

View file

@ -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);

64
lib/ace/mode/yaml.js Normal file
View file

@ -0,0 +1,64 @@
/* ***** BEGIN LICENSE BLOCK *****
* The Original Code is Ajax.org Code Editor (ACE).
*
* Contributor(s):
* Meg Sharkey <megshark AT gmail DOT com>
*
* 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;
});

View file

@ -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 <megshark AT gmail DOT com>
*
* 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;
});

View file

@ -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;\

View file

@ -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;\

View file

@ -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;