Merge branch 'pentool' into brushtool

Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
author: Pushkar Joshi 2012-02-24 12:08:49 -0800
committer: Pushkar Joshi 2012-02-24 12:08:49 -0800
commit: 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree: c51112223ceb9121cd595a60335eb2795215590f /js/codemirror/mode/yaml/index.html
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
1 files changed, 0 insertions, 68 deletions
diff --git a/js/codemirror/mode/yaml/index.html b/js/codemirror/mode/yaml/index.html
deleted file mode 100644
index e8d04d18..00000000
--- a/js/codemirror/mode/yaml/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>CodeMirror 2: YAML mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="yaml.js"></script>
-    <link rel="stylesheet" href="../../theme/default.css">
-    <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
-    <link rel="stylesheet" href="../../css/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror 2: YAML mode</h1>
-    <form><textarea id="code" name="code">
--- # Favorite movies
- Casablanca
- North by Northwest
- The Man Who Wasn't There
--- # Shopping list
-[milk, pumpkin pie, eggs, juice]
--- # Indented Blocks, common in YAML data files, use indentation and new lines to separate the key: value pairs
-  name: John Smith
-  age: 33
--- # Inline Blocks, common in YAML data streams, use commas to separate the key: value pairs between braces
-{name: John Smith, age: 33}
---
-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.
-...
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-    <p><strong>MIME types defined:</strong> <code>text/x-yaml</code>.</p>
-  </body>
-</html>
author	Pushkar Joshi	2012-02-24 12:08:49 -0800
committer	Pushkar Joshi	2012-02-24 12:08:49 -0800
commit	03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree	c51112223ceb9121cd595a60335eb2795215590f /js/codemirror/mode/yaml/index.html
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

diff --git a/js/codemirror/mode/yaml/index.html b/js/codemirror/mode/yaml/index.html deleted file mode 100644 index e8d04d18..00000000 --- a/js/codemirror/mode/yaml/index.html +++ /dev/null
@@ -1,68 +0,0 @@
1	<!doctype html>
2	<html>
3	<head>
4	<title>CodeMirror 2: YAML mode</title>
5	<link rel="stylesheet" href="../../lib/codemirror.css">
6	<script src="../../lib/codemirror.js"></script>
7	<script src="yaml.js"></script>
8	<link rel="stylesheet" href="../../theme/default.css">
9	<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
10	<link rel="stylesheet" href="../../css/docs.css">
11	</head>
12	<body>
13	<h1>CodeMirror 2: YAML mode</h1>
14	<form><textarea id="code" name="code">
15	--- # Favorite movies
16	- Casablanca
17	- North by Northwest
18	- The Man Who Wasn't There
19	--- # Shopping list
20	[milk, pumpkin pie, eggs, juice]
21	--- # Indented Blocks, common in YAML data files, use indentation and new lines to separate the key: value pairs
22	name: John Smith
23	age: 33
24	--- # Inline Blocks, common in YAML data streams, use commas to separate the key: value pairs between braces
25	{name: John Smith, age: 33}
26	---
27	receipt: Oz-Ware Purchase Invoice
28	date: 2007-08-06
29	customer:
30	given: Dorothy
31	family: Gale
32
33	items:
34	- part_no: A4786
35	descrip: Water Bucket (Filled)
36	price: 1.47
37	quantity: 4
38
39	- part_no: E1628
40	descrip: High Heeled "Ruby" Slippers
41	size: 8
42	price: 100.27
43	quantity: 1
44
45	bill-to: &id001
46	street: \|
47	123 Tornado Alley
48	Suite 16
49	city: East Centerville
50	state: KS
51
52	ship-to: *id001
53
54	specialDelivery: >
55	Follow the Yellow Brick
56	Road to the Emerald City.
57	Pay no attention to the
58	man behind the curtain.
59	...
60	</textarea></form>
61	<script>
62	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
63	</script>
64
65	<p><strong>MIME types defined:</strong> <code>text/x-yaml</code>.</p>
66
67	</body>
68	</html>