light9 Changeset - a36928f7cc35

Changeset - a36928f7cc35

Parent rev.

Child rev.

[Not reviewed]

default

1 11 0

Drew Perttula - 9 years ago 2016-05-30 06:57:23
drewp@bigasterisk.com

upgrade jquery, use bower
Ignore-this: 456b1f3a8aba410e9acf8e61a7f6bb73

12 files changed with 14 insertions and 14 deletions:

light9/ascoltami/index.html

light9/effecteval/effect-components.html

light9/effecteval/effect.html

light9/rdfdb/web/graphView.xhtml

light9/rdfdb/web/index.xhtml

light9/subcomposer/index.html

light9/subserver/effects.jade

light9/subserver/index.jade

light9/vidref/vidref.html

light9/web/lib/bower.json

light9/web/lib/jquery-2.1.1.min.js

makefile

0 comments (0 inline, 0 general)

light9/ascoltami/index.html

➞

Show inline comments

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:py="http://genshi.edgewall.org/">
   <head>
     <title>ascoltami on ${host}</title>
-    <script type="text/javascript" src="/lib/jquery-2.1.1.min.js"></script>
+    <script type="text/javascript" src="/lib/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="/lib/jquery-ui-1.11.4/jquery-ui.min.js"></script>
     <link rel="Stylesheet" type="text/css" href="/lib/jquery-ui-1.11.4/themes/smoothness/jquery-ui.min.css"/>
     <link rel="Stylesheet" type="text/css" href="/style.css"/>
   </head>
   <body>
     <h1>ascoltami on ${host}</h1>
     <div class="songs"/>
     <div class="dimStalled">
       <table>
         <tr><td colspan="3">Song: <span id="currentSong"/></td></tr>
         <tr>

light9/effecteval/effect-components.html

➞

Show inline comments

 <link rel="import" href="/lib/polymer/polymer.html">
 <script src="/websocket.js"></script>
-<script src="/lib/jquery-2.1.1.min.js"></script>
+<script src="/lib/jquery/dist/jquery.min.js"></script>
 <dom-module id="song-effect-list">
   <template>
     <template is="dom-repeat" items="{{songs}}" as="song">
       <li>
         <a class="song"
            href="{{song.uri}}"
            on-click="focusSong">Song <span>{{song.label}}</span></a>
         <ul>
           <template is="dom-repeat" items="{{song.effects}}" as="effect">
             <li>
               <l9-effect uri="{{effect.uri}}"

light9/effecteval/effect.html

➞

Show inline comments

@@ @@ -9,19 +9,19 @@ @@
   <body>
     <div id="status">starting...</div>
     <a href="./">Effects</a> / <a class="effect" data-bind="attr: {href: toSave.uri}, text: toSave.uri"></a>
     <div data-bind="foreach: toSave.codeLines">
       <div>
         code:
         <input type="text" size="160" data-bind="value: text"></input>
       </div>
     </div>
-    <script src="/lib/jquery-2.1.1.min.js"></script>
+    <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="/lib/knockout-3.1.0.js"></script>
     <script src="/websocket.js"></script>
     <script src="/lib/QueryString.js"></script>
     <script src="effect.js"></script>
   </body>
 </html>

light9/rdfdb/web/graphView.xhtml

➞

Show inline comments

@@ @@ -23,24 +23,24 @@ @@
     <p>URI substring: <input type="text" id="uriSubstring"/></p>
     <table>
       <thead>
         <tr>
           <th>subject</th> <th>predicate</th> <th>object</th> <th>context</th>
         </tr>
       </thead>
       <tbody>
       </tbody>
     </table>
-    <script type="text/javascript" src="/lib/jquery-2.1.1.min.js"></script>
+    <script type="text/javascript" src="/lib/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="/websocket.js"></script>
     <script type="text/javascript" src="syncedgraph.js"></script>
     <script type="text/javascript">
       // <![CDATA[
       $(function(){
       });
       // ]]>
     </script>
   </body>
 </html>

light9/rdfdb/web/index.xhtml

➞

Show inline comments

@@ @@ -13,25 +13,25 @@ @@
     <section>
       <h2>Edits</h2>
       <div id="patches"></div>
     </section>
     <p>Clients: <span id="clients"/></p>
     <fieldset>
       <legend>Messages</legend>
       <div id="out"></div>
     </fieldset>
-    <script type="text/javascript" src="/lib/jquery-2.1.1.min.js"></script>
+    <script type="text/javascript" src="/lib/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="/websocket.js"></script>
     <script type="text/javascript">
       // <![CDATA[
       $(function(){
           function collapseCuries(s) {
             // this is temporary. The correct thing is to parse the quad (or receive it as a tree) and then make links to the full URIs and display curies of them
               return s
                   .replace(/<http:\/\/www.w3.org\/2001\/XMLSchema#(.*?)>/g, function (match, short) { return "xsd:"+short; })
                   .replace(/<http:\/\/light9.bigasterisk.com\/(.*?)>/g, function (match, short) { return "light9:"+short; })
                   .replace(/<http:\/\/light9.bigasterisk.com\/show\/dance2012\/sessions\/(.*?)>/g, function (match, short) { return "kcsession:"+short });

light9/subcomposer/index.html

➞

Show inline comments

@@ @@ -41,25 +41,25 @@ @@
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f2-out">f2-c</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f3">f3-r</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f4">f4-purp</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f5">f5-rose-x2</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/sharlyn">sharlyn</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f7">f7-c</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f8">f8-blue-x2</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f9">f9-purp</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f10">f10-l</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f11">f11-c</button>
     <button data-chan="http://light9.bigasterisk.com/theater/piedmont/channel/f12-out">f12-r</button>
-    <script src="/lib/jquery-2.1.1.min.js"></script>
+    <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script>
       $(document).on("click", "button", function (ev) {
           var chan = ev.target.getAttribute('data-chan');
           $.ajax({
               type: 'POST',
               url: 'toggle',
               data: {chan: chan}
           });
       });
     </script>
   </body>
 </html>

light9/subserver/effects.jade

➞

Show inline comments

@@ @@ -26,16 +26,16 @@ html @@
     div(data-bind="foreach: classes")
       div.resource.effectClass
         h2
           | Effect class
+          |
           a(data-bind="attr: {href: uri}, text: label")
           button(data-bind="click: $root.addToCurrentSong") Add to current song
         div
           code(data-bind="text: code")
     #status
-    script(src="/lib/jquery-2.1.1.min.js")
+    script(src="/lib/jquery/dist/jquery.min.js")
     script(src="/lib/knockout-3.1.0.js")
     script(src="/websocket.js")
     script(src="effects.js")
@@ \ No newline at end of file @@

light9/subserver/index.jade

➞

Show inline comments

@@ @@ -20,16 +20,16 @@ html @@
           | Label
           input(type="text", data-bind="value: label")
         div
           img(data-bind="attr: {src: img}")
         div
           button(data-bind="click: $root.snapshot")
             New snapshot
       // /ko
     #status
-    script(src="/lib/jquery-2.1.1.min.js")
+    script(src="/lib/jquery/dist/jquery.min.js")
     script(src="/lib/knockout-3.1.0.js")
     script(src="/websocket.js")
     script(src="gui.js")
@@ \ No newline at end of file @@

light9/vidref/vidref.html

➞

Show inline comments

@@ @@ -90,25 +90,25 @@ @@
         </select>
       </label></div>
       <div>See <a href="http://picamera.readthedocs.org/en/release-1.4/api.html#picamera.PiCamera.ISO">picamera attribute docs</a></div>
     </fieldset>
     <div>Resulting url: <a class="smallUrl" data-bind="attr: {href: currentUrl}, text: currentUrl"></a></div>
     <div>Resulting crop image:</div>
     <div><img id="cropped"></div>
     <script src="/lib/knockout-3.1.0.js"></script>
-    <script src="/lib/jquery-2.1.1.min.js"></script>
+    <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="/lib/underscore-min.js"></script>
     <script src="/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.js"></script>
     <script>
      jQuery(function () {
        var model = {
          baseUrl: ko.observable(),
          crop: ko.observable({x: 0, y: 0, w: 1, h: 1}),
          params: {
            shutter: ko.observable(50000),
            exposure_mode: ko.observable('auto'),
            awb_mode: ko.observable('auto'),
            brightness: ko.observable(50),

light9/web/lib/bower.json

➞

Show inline comments

+{
   "name": "3rd-party polymer elements",
   "dependencies": {
     "polymer": "~1.4.0",
     "paper-slider": "PolymerElements/paper-slider#~1.0.11",
     "iron-ajax": "PolymerElements/iron-ajax#~1.2.0"
     "iron-ajax": "PolymerElements/iron-ajax#~1.2.0",
     "jquery": "~2.2.4"
+  }
+}

light9/web/lib/jquery-2.1.1.min.js

➞

Show inline comments

deleted file

makefile

➞

Show inline comments

@@ @@ -51,24 +51,27 @@ tkdnd_build: @@
 	cd tkdnd/trunk
 	./configure
 	make
 bin/ascoltami2: gst_packages link_to_sys_packages
 gst_packages:
 	sudo aptitude install python-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio
 packages:
 	sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame gir1.2-goocanvas-2.0-9 libffi-dev tix libzmq3 python-dev libssl-dev
 bower:
 	cd light9/web/lib; bower install
 raspberry_pi_virtualenv:
 	mkdir -p env_pi
 	virtualenv --system-site-packages env_pi
 raspberry_pi_packages:
 	sudo apt-get install python-picamera python-twisted
 	env_pi/bin/pip install cyclone coloredlogs
 darcs_show_checkpoint:
 	darcs add --quiet --recursive ${LIGHT9_SHOW}
 	darcs rec -a -m "checkpoint show data" ${LIGHT9_SHOW}

0 comments (0 inline, 0 general)