From 10c65561ed5d5b72ddb109ea905d8a9a5d317990 Mon Sep 17 00:00:00 2001 From: Martin Zimmermann Date: Thu, 12 Sep 2013 11:46:09 +0200 Subject: [PATCH] mv /client to /js --- isso/__init__.py | 2 +- isso/{client => js}/app/api.js | 8 ++++---- isso/{client => js}/app/forms.js | 0 isso/{client => js}/app/isso.js | 0 isso/{client => js}/build.js | 0 isso/{client => js}/helper/identicons.js | 0 isso/{client => js}/helper/utils.js | 0 isso/{client => js}/lib/HTML.js | 0 isso/{client => js}/lib/almond.js | 0 isso/{client => js}/lib/q.js | 0 isso/{client => js}/lib/ready.js | 0 isso/{client => js}/main.js | 0 isso/{client => js}/require.js | 0 isso/static/post.html | 4 ++-- 14 files changed, 7 insertions(+), 7 deletions(-) rename isso/{client => js}/app/api.js (95%) rename isso/{client => js}/app/forms.js (100%) rename isso/{client => js}/app/isso.js (100%) rename isso/{client => js}/build.js (100%) rename isso/{client => js}/helper/identicons.js (100%) rename isso/{client => js}/helper/utils.js (100%) rename isso/{client => js}/lib/HTML.js (100%) rename isso/{client => js}/lib/almond.js (100%) rename isso/{client => js}/lib/q.js (100%) rename isso/{client => js}/lib/ready.js (100%) rename isso/{client => js}/main.js (100%) rename isso/{client => js}/require.js (100%) diff --git a/isso/__init__.py b/isso/__init__.py index e2bca22..854fe21 100644 --- a/isso/__init__.py +++ b/isso/__init__.py @@ -155,7 +155,7 @@ def main(): app = SharedDataMiddleware(isso.wsgi_app, { '/static': join(dirname(__file__), 'static/'), - '/client': join(dirname(__file__), 'client/') + '/js': join(dirname(__file__), 'js/') }) run_simple(conf.get('server', 'host'), conf.getint('server', 'port'), diff --git a/isso/client/app/api.js b/isso/js/app/api.js similarity index 95% rename from isso/client/app/api.js rename to isso/js/app/api.js index c906ba0..a950713 100644 --- a/isso/client/app/api.js +++ b/isso/js/app/api.js @@ -15,11 +15,11 @@ define(["lib/q"], function(Q) { // guess Isso API location var js = document.getElementsByTagName("script"); for (var i = 0; i < js.length; i++) { - if (js[i].src.match("/client/require\\.js$")) { - endpoint = js[i].src.substring(0, js[i].src.length - 18); + if (js[i].src.match("/js/require\\.js$")) { + endpoint = js[i].src.substring(0, js[i].src.length - 14); break; - } else if (js[i].src.match("/client/embed\\.js$")) { - endpoint = js[i].src.substring(0, js[i].src.length - 16); + } else if (js[i].src.match("/js/embed\\.js$")) { + endpoint = js[i].src.substring(0, js[i].src.length - 12); break; } diff --git a/isso/client/app/forms.js b/isso/js/app/forms.js similarity index 100% rename from isso/client/app/forms.js rename to isso/js/app/forms.js diff --git a/isso/client/app/isso.js b/isso/js/app/isso.js similarity index 100% rename from isso/client/app/isso.js rename to isso/js/app/isso.js diff --git a/isso/client/build.js b/isso/js/build.js similarity index 100% rename from isso/client/build.js rename to isso/js/build.js diff --git a/isso/client/helper/identicons.js b/isso/js/helper/identicons.js similarity index 100% rename from isso/client/helper/identicons.js rename to isso/js/helper/identicons.js diff --git a/isso/client/helper/utils.js b/isso/js/helper/utils.js similarity index 100% rename from isso/client/helper/utils.js rename to isso/js/helper/utils.js diff --git a/isso/client/lib/HTML.js b/isso/js/lib/HTML.js similarity index 100% rename from isso/client/lib/HTML.js rename to isso/js/lib/HTML.js diff --git a/isso/client/lib/almond.js b/isso/js/lib/almond.js similarity index 100% rename from isso/client/lib/almond.js rename to isso/js/lib/almond.js diff --git a/isso/client/lib/q.js b/isso/js/lib/q.js similarity index 100% rename from isso/client/lib/q.js rename to isso/js/lib/q.js diff --git a/isso/client/lib/ready.js b/isso/js/lib/ready.js similarity index 100% rename from isso/client/lib/ready.js rename to isso/js/lib/ready.js diff --git a/isso/client/main.js b/isso/js/main.js similarity index 100% rename from isso/client/main.js rename to isso/js/main.js diff --git a/isso/client/require.js b/isso/js/require.js similarity index 100% rename from isso/client/require.js rename to isso/js/require.js diff --git a/isso/static/post.html b/isso/static/post.html index ed01cc2..2763567 100644 --- a/isso/static/post.html +++ b/isso/static/post.html @@ -4,8 +4,8 @@ Hello World - - + +