Mercurial Mercurial > mons / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct code generation + index.html + time display
authorymh <ymh.work@gmail.com>
Tue, 13 Jan 2015 15:27:20 +0100
changeset 87 9611905b58fe
parent 86 e944c017b8c8
child 88 2e2414765a59
child 93 79ae42ad97d4
correct code generation + index.html + time display
client/annotviz/app/index.html file | annotate | diff | comparison | revisions
client/annotviz/app/js/main.js file | annotate | diff | comparison | revisions
client/annotviz/gulp/tasks/browserify.js file | annotate | diff | comparison | revisions 
--- a/client/annotviz/app/index.html	Tue Jan 13 14:03:31 2015 +0100
+++ b/client/annotviz/app/index.html	Tue Jan 13 15:27:20 2015 +0100
@@ -10,7 +10,7 @@
     <title>Piano Roll</title>
 
     <!-- Custom styles for this template -->
-    <link href="/css/pianoroll.css" rel="stylesheet">
+    <link href="/css/annotviz.css" rel="stylesheet">
 </head>
 
 <body>
@@ -22,14 +22,14 @@
         - temps écoulé : <span id="myspan"></span>
     </p>
     <pre id="log"></pre>
-    <script src="/js/libs-pianoroll.js"></script>
+    <script src="/js/libs-annotviz.js"></script>
     <script>
     var eventCode = "test_1";
     </script>
-    <script src="/js/pianoroll.js"></script>
+    <script src="/js/annotviz.js"></script>
     <script>
-    var moveInterval = pianoroll.moveInterval;
-    var verticalLinesInterval = pianoroll.verticalLinesInterval;
+    var moveInterval = annotviz.moveInterval;
+    var verticalLinesInterval = annotviz.verticalLinesInterval;
     </script>
 </body>
 </html>
--- a/client/annotviz/app/js/main.js	Tue Jan 13 14:03:31 2015 +0100
+++ b/client/annotviz/app/js/main.js	Tue Jan 13 15:27:20 2015 +0100
@@ -106,7 +106,7 @@
 }
 
 function addLine(){
-    ts = new Date();
+    var ts = new Date();
     for(var i=0;i<containerList.length;i++){
         containerList[i].addLine(ts);
     }
--- a/client/annotviz/gulp/tasks/browserify.js	Tue Jan 13 14:03:31 2015 +0100
+++ b/client/annotviz/gulp/tasks/browserify.js	Tue Jan 13 15:27:20 2015 +0100
@@ -16,13 +16,13 @@
     .require('./app/lib/pixi/bin/pixi.js', { expose: 'pixi' })
     .require('./app/lib/randomColor/randomColor.js', {expose: 'randomColor'})
     .bundle()
-    .pipe(source('libs-pianoroll.js'))
+    .pipe(source('libs-'+p.name+'.js'))
     .pipe(gulp.dest(config.dist + '/js/'));
 });
 
 // Browserify
 gulp.task('browserify', function() {
-  return browserify({debug: true, standalone: 'pianoroll'})
+  return browserify({debug: true, standalone: 'annotviz'})
     .add('./app/js/main.js')
     .external('pixi')
     .external('randomColor')
mons