From 7294662868dd0767eb01f79f9daad56bc071a06d Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 30 Mar 2012 16:17:56 +0200 Subject: [PATCH] use SyntaxHighlighter in readme --- readme/css/readme.css | 3 +-- readme/html/test1.html | 2 +- readme/html/test2.html | 59 +++++++++++++++++++++++++++++++++++++++++- readme/js/readme.js | 15 +++++++++-- 4 files changed, 73 insertions(+), 6 deletions(-) diff --git a/readme/css/readme.css b/readme/css/readme.css index 444952ae..b5cf0b9c 100644 --- a/readme/css/readme.css +++ b/readme/css/readme.css @@ -20,8 +20,7 @@ code { .text { padding: 16px 24px 16px 24px; } -.title { +.text h1 { font-weight: bold; font-size: 16px; } - diff --git a/readme/html/test1.html b/readme/html/test1.html index d52bc914..2e01e7bb 100644 --- a/readme/html/test1.html +++ b/readme/html/test1.html @@ -1,4 +1,4 @@ -

This is just a test

+

This is just a test

Foo bar baz.

diff --git a/readme/html/test2.html b/readme/html/test2.html index c23a4b20..f2ddc351 100644 --- a/readme/html/test2.html +++ b/readme/html/test2.html @@ -1 +1,58 @@ -

This is another test, with a longer title

\ No newline at end of file +

Before and After

+

+// before:
+var exists = array.indexOf(value) > -1;
+// after:
+var exists = Ox.in(array, value);
+
+// before:
+var key;
+for (var k in obj) {
+    if (obj[k] === value) {
+        key = k;
+        break;
+    }
+}
+// after:
+var key = Ox.keyOf(object, value);
+
+
+// before:
+var last = arrayWithLongName[arrayWithLongName.length - 1];
+// after:
+var last = Ox.last(arrayWithLongName);
+
+// before:
+arrayWithLongName[arrayWithLongName.length - 1] = 0;
+// after:
+Ox.last(arrayWithLongName, 0);
+
+// before:
+myString = myString.substr(2, myString.length - 4);
+// or:
+myString = myString.substring(2, myString.length - 2);
+// after:
+myString = Ox.sub(myString, 2, -2);
+
+// before:
+myArray = myArray.filter(function(v, i) {
+    return i > 1 && i < myArray.length - 2;
+});
+// after:
+myArray = Ox.sub(myArray, 2, -2);
+
+// before:
+myNumber = Math.min(Math.max(myNumber, min), max);
+// after:
+myNumber = Ox.limit(myNumber, min, max);
+
+// before:
+var random = min + Math.floor(Math.random() * (max - min));
+// after:
+var random = Ox.random(min, max);
+
+// before:
+var mod = -1 % 10 // -1;
+// after:
+var mod = Ox.mod(-1, 10) // 9
+

\ No newline at end of file diff --git a/readme/js/readme.js b/readme/js/readme.js index 217e4fba..8734d861 100644 --- a/readme/js/readme.js +++ b/readme/js/readme.js @@ -17,7 +17,7 @@ Ox.load('UI', function() { function loadHTML(files, callback) { files.forEach(function(file) { Ox.get('html/' + file.name, function(html) { - var match = html.match(/

(.+)<\/p>/); + var match = html.match(/

(.+)<\/h1>/); items.push({ date: file.date, file: file.name, @@ -42,7 +42,7 @@ Ox.load('UI', function() { .addClass('head') .append($ui.logo) .append($ui.title); - $ui.text = Ox.Element().addClass('text'), + $ui.text = Ox.Container().addClass('text'), $ui.inner = Ox.SplitPanel({ elements: [ { @@ -121,6 +121,17 @@ Ox.load('UI', function() { Ox.print(data) if (data.ids.length) { $ui.text.html(Ox.getObject(items, 'file', data.ids[0]).html); + $ui.text.find('.code').each(function() { + var $this = $(this); + $this.replaceWith( + Ox.SyntaxHighlighter({ + source: $this.text() + }) + .css({ + border: '1px solid rgb(192, 192, 192)' + }) + ); + }) } else { $ui.text.empty(); }