From a33f15f417dc1e0628ac4e98fad0088d6deaba1f Mon Sep 17 00:00:00 2001 From: Tomek Wytrebowicz Date: Tue, 11 Aug 2015 10:33:49 +0200 Subject: [PATCH 1/6] Use lates webcomponentsjs polyfill --- bower.json | 2 +- index.html | 16 ++++++++-------- kitchen-sink.html | 32 ++++++++++++++++---------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bower.json b/bower.json index bc284f0..e6bd3b9 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,7 @@ "img" ], "dependencies": { - "webcomponentsjs": "~0.6.0" + "webcomponentsjs": "~0.7.10" }, "homepage": "https://github.com/Juicy/juicy-ace-editor", "authors": [ diff --git a/index.html b/index.html index 8c2f0b2..447d791 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ html,body{ height: 100%; } - #editor { + #editor { top: 0; right: 0; bottom: 0; @@ -22,7 +22,7 @@ width: 100%; height: 40%; } - juicy-ace-editor { + juicy-ace-editor { margin: 15px 15px; width: 45%; height: 13em; @@ -49,8 +49,8 @@ allowtransparency="true" frameborder="0" scrolling="0" width="90" height="30">

<juicy-ace-editor>

- Even more embeddable code editor. - Custom Element - just one tag, and no JS needed to provide Ace + Even more embeddable code editor. + Custom Element - just one tag, and no JS needed to provide Ace - The High Performance Code Editor

@@ -60,7 +60,7 @@

<juicy-ace-editor>

<juicy-ace-editor>element.

- You can switch modes and themes as regular HTML attributes to + You can switch modes and themes as regular HTML attributes to whatever is supported by Ace @@ -72,7 +72,7 @@

<juicy-ace-editor>

&lt;/juicy-ace-editor&gt;</pre>element. </p> <p> - You can switch modes and themes as regular HTML attributes to + You can switch modes and themes as regular HTML attributes to <a href="https://github.com/ajaxorg/ace-builds/tree/master/src"> whatever is supported by Ace </a> @@ -81,7 +81,7 @@

<juicy-ace-editor>

-

Ok, in fact you have seen +

Ok, in fact you have seen 

<juicy-ace-editor theme="ace/theme/monokai" mode="ace/mode/html">&lt;p&gt;Here you have:..

diff --git a/kitchen-sink.html b/kitchen-sink.html index def9ec5..f4d33a9 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -4,13 +4,13 @@ <juicy-ace-editor> Kitchen Sink - - - - + + + + - + @@ -56,7 +56,7 @@ @@ -260,23 +260,23 @@ --> - + - Type your code here, to test. - <juicy-ace-editor + <juicy-ace-editor theme="{{theme}}" - mode="{{mode}}" + mode="{{mode}}" fontsize="{{fontsize}}" readonly="{{readonly}}" softtabs="{{softtabs}}" @@ -288,14 +288,14 @@ Sorry I was to lazy to get through http://ace.c9.io/build/kitchen-sink/demo.js ;) - - + From d85fd0792c2d8fe046c1d0028f0ffaf88da68c77 Mon Sep 17 00:00:00 2001 From: Tomek Wytrebowicz Date: Tue, 11 Aug 2015 10:47:09 +0200 Subject: [PATCH 4/6] Make kitchen sink use Polymer 1.0 - fixes #8 --- kitchen-sink.html | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/kitchen-sink.html b/kitchen-sink.html index f4d33a9..fe326e4 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -14,7 +14,7 @@ -