# HG changeset patch # User Drew Perttula # Date 2014-05-28 05:54:23 # Node ID a4632a7b2e17592bcb91544215fa82f9b0571f60 # Parent b65995e32a232bbb7ce16a95b2a94dc16b79c921 upgrade knockout and jquery, simplify the static/ dirs for all web services Ignore-this: 8637b7b61cc5d38e8cf15bb1afd7466c diff --git a/bin/effecteval b/bin/effecteval --- a/bin/effecteval +++ b/bin/effecteval @@ -142,9 +142,10 @@ class App(object): {'path': 'light9/effecteval', 'default_filename': 'index.html'}), (r'/effect', EffectEdit), (r'/(websocket\.js)', SFH, {'path': 'light9/rdfdb/web/'}), - (r'/(knockout-2\.2\.1\.js)', SFH, {'path': 'light9/subserver/'}), (r'/effect\.js', StaticCoffee, {'src': 'light9/effecteval/effect.coffee'}), - (r'/effectData', EffectData), + (r'/index\.js', StaticCoffee, {'src': 'light9/effecteval/index.coffee'}), + (r'/effectUpdates', EffectUpdates), + (r'/songEffectsUpdates', SongEffectsUpdates), (r'/static/(.*)', SFH, {'path': 'static/'}), (r'/effect/eval', EffectEval), (r'/songEffects/eval', SongEffectsEval), diff --git a/bin/rdfdb b/bin/rdfdb --- a/bin/rdfdb +++ b/bin/rdfdb @@ -456,6 +456,7 @@ if __name__ == "__main__": (r'/patches', Patches), (r'/graphClients', GraphClients), + (r'/static/(.*)', cyclone.web.StaticFileHandler, {'path': 'static/'}), (r'/(.*)', NoExts, {"path" : "light9/rdfdb/web", "default_filename" : "index.xhtml"}), diff --git a/bin/subserver b/bin/subserver --- a/bin/subserver +++ b/bin/subserver @@ -49,15 +49,7 @@ class Static(PrettyErrorHandler, cyclone return self.respondStaticJade("light9/subserver/%s.jade" % (path or 'index')) - oddlyPlaced = { - "websocket.js": "light9/rdfdb/web/websocket.js", - "jquery-1.7.2.min.js": "light9/rdfdb/web/lib/jquery-1.7.2.min.js", - } - if path in oddlyPlaced: - self.write(open(oddlyPlaced[path]).read()) - return - - if path.endswith(".js") and path not in ['knockout-2.2.1.js']: + if path.endswith(".js"): return self.responseStaticCoffee( 'light9/subserver/%s' % path.replace(".js", ".coffee")) # potential security hole @@ -144,6 +136,7 @@ if __name__ == "__main__": reactor.listenTCP(port, cyclone.web.Application(handlers=[ (r'/live', Live), (r'/snapshot', Snapshot), + (r'/static/(.*)', cyclone.web.StaticFileHandler, {'path': 'static/'}), (r'/(.*)', Static, {"path" : "light9/subserver", "default_filename" : "index.jade"}), diff --git a/light9/ascoltami/index.html b/light9/ascoltami/index.html --- a/light9/ascoltami/index.html +++ b/light9/ascoltami/index.html @@ -5,7 +5,7 @@ xmlns:py="http://genshi.edgewall.org/"> ascoltami on ${host} - + diff --git a/light9/effecteval/effect.html b/light9/effecteval/effect.html --- a/light9/effecteval/effect.html +++ b/light9/effecteval/effect.html @@ -9,9 +9,10 @@
code:
- - - + + + + diff --git a/light9/effecteval/index.html b/light9/effecteval/index.html --- a/light9/effecteval/index.html +++ b/light9/effecteval/index.html @@ -11,5 +11,9 @@
  • song1 -> opening look
  • song1 -> full
    • + + + + diff --git a/light9/rdfdb/web/graphView.xhtml b/light9/rdfdb/web/graphView.xhtml --- a/light9/rdfdb/web/graphView.xhtml +++ b/light9/rdfdb/web/graphView.xhtml @@ -32,8 +32,8 @@ - - + + - \ No newline at end of file + diff --git a/light9/rdfdb/web/index.xhtml b/light9/rdfdb/web/index.xhtml --- a/light9/rdfdb/web/index.xhtml +++ b/light9/rdfdb/web/index.xhtml @@ -22,8 +22,8 @@
    - - + +