From 56408bdaa40f36ebb150719b971bbe1cd6050279 Mon Sep 17 00:00:00 2001
From: eston <eston@github.com>
Date: Wed, 2 Mar 2011 17:28:32 -0800
Subject: [PATCH] Move editor stuff to same directories as GitHub to keep from
 URI confusion

---
 .../javascript/{gollum-editor => editor}/gollum.editor.js       | 2 +-
 .../javascript/{gollum-editor => editor}/langs/asciidoc.js      | 0
 .../public/javascript/{gollum-editor => editor}/langs/creole.js | 0
 .../javascript/{gollum-editor => editor}/langs/markdown.js      | 0
 .../public/javascript/{gollum-editor => editor}/langs/org.js    | 0
 .../public/javascript/{gollum-editor => editor}/langs/pod.js    | 0
 .../public/javascript/{gollum-editor => editor}/langs/rdoc.js   | 0
 .../javascript/{gollum-editor => editor}/langs/textile.js       | 0
 lib/gollum/frontend/templates/layout.mustache                   | 2 +-
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/gollum.editor.js (99%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/asciidoc.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/creole.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/markdown.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/org.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/pod.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/rdoc.js (100%)
 rename lib/gollum/frontend/public/javascript/{gollum-editor => editor}/langs/textile.js (100%)

diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js b/lib/gollum/frontend/public/javascript/editor/gollum.editor.js
similarity index 99%
rename from lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js
rename to lib/gollum/frontend/public/javascript/editor/gollum.editor.js
index 0a1aabe9..48309285 100755
--- a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js
+++ b/lib/gollum/frontend/public/javascript/editor/gollum.editor.js
@@ -233,7 +233,7 @@
       }
 
       // attempt to load the definition for this language
-      var script_uri = '/javascripts/editor/langs/' + markup_name + '.js';
+      var script_uri = '/javascript/editor/langs/' + markup_name + '.js';
       $.ajax({
                 url: script_uri,
                 dataType: 'script',
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js b/lib/gollum/frontend/public/javascript/editor/langs/asciidoc.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/asciidoc.js
rename to lib/gollum/frontend/public/javascript/editor/langs/asciidoc.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/creole.js b/lib/gollum/frontend/public/javascript/editor/langs/creole.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/creole.js
rename to lib/gollum/frontend/public/javascript/editor/langs/creole.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js b/lib/gollum/frontend/public/javascript/editor/langs/markdown.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/markdown.js
rename to lib/gollum/frontend/public/javascript/editor/langs/markdown.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/org.js b/lib/gollum/frontend/public/javascript/editor/langs/org.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/org.js
rename to lib/gollum/frontend/public/javascript/editor/langs/org.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js b/lib/gollum/frontend/public/javascript/editor/langs/pod.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/pod.js
rename to lib/gollum/frontend/public/javascript/editor/langs/pod.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js b/lib/gollum/frontend/public/javascript/editor/langs/rdoc.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/rdoc.js
rename to lib/gollum/frontend/public/javascript/editor/langs/rdoc.js
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js b/lib/gollum/frontend/public/javascript/editor/langs/textile.js
similarity index 100%
rename from lib/gollum/frontend/public/javascript/gollum-editor/langs/textile.js
rename to lib/gollum/frontend/public/javascript/editor/langs/textile.js
diff --git a/lib/gollum/frontend/templates/layout.mustache b/lib/gollum/frontend/templates/layout.mustache
index d9877ddc..1773a906 100755
--- a/lib/gollum/frontend/templates/layout.mustache
+++ b/lib/gollum/frontend/templates/layout.mustache
@@ -17,7 +17,7 @@
   <script type="text/javascript" src="/javascript/gollum.placeholder.js"></script>
   
   <script type="text/javascript" 
-    src="/javascript/gollum-editor/gollum.editor.js"></script>
+    src="/javascript/editor/gollum.editor.js"></script>
   <title>{{title}}</title>
 </head>
 <body>