Mercurial Mercurial > hashcut / 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.
compile js + new version V00.07
authorymh <ymh.work@gmail.com>
Thu, 06 Dec 2012 16:52:46 +0100
changeset 135 d081fc4250c2
parent 134 62081cdc367c
child 136 ce27200b338e
compile js + new version
.hgignore file | annotate | diff | comparison | revisions
integration/js/compile.sh file | annotate | diff | comparison | revisions
src/hashcut/__init__.py file | annotate | diff | comparison | revisions
src/hashcut/static/hashcut/js/hashcut.js file | annotate | diff | comparison | revisions 
--- a/.hgignore	Thu Dec 06 15:31:49 2012 +0100
+++ b/.hgignore	Thu Dec 06 16:52:46 2012 +0100
@@ -1,11 +1,9 @@
 
 syntax: regexp
 ^\.project$
-syntax: regexp
 ^\.hgcheck$
-syntax: regexp
 ^\.pydevproject$
-syntax: regexp
 ^integration/js/hashcut\.js$
-syntax: regexp
-^\.settings$
\ No newline at end of file
+^\.settings$
+\.DS_Store$
+.*\.pyc$
--- a/src/hashcut/__init__.py	Thu Dec 06 15:31:49 2012 +0100
+++ b/src/hashcut/__init__.py	Thu Dec 06 16:52:46 2012 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 0, "final", 0)
+VERSION = (0, 7, 0, "final", 0)
 
 
 def get_version():
--- a/src/hashcut/static/hashcut/js/hashcut.js	Thu Dec 06 15:31:49 2012 +0100
+++ b/src/hashcut/static/hashcut/js/hashcut.js	Thu Dec 06 16:52:46 2012 +0100
@@ -1835,8 +1835,6 @@
 /*
             webm_src = $('<source>'),
 */
-            lastseektime,
-            currentseektime;
         mp4_src.attr({
             src: videourl, //mp4_file,
             type: "video/mp4"
@@ -1874,14 +1872,9 @@
         
         media.on("setcurrenttime", function(_milliseconds) {
             if (media.loaded) {
-                if (!media.seeking) {
-                    lastseektime = currentseektime = _milliseconds.valueOf();
-                    popcorn.currentTime(currentseektime / 1000);
-                    media.seeking = true;
-                    setTimeout(showSeek,200);
-                } else {
-                    lastseektime = _milliseconds.valueOf();
-                }
+                popcorn.currentTime(_milliseconds / 1000);
+                media.seeking = true;
+                setTimeout(showSeek,200);
             }
         });
         
@@ -1943,13 +1936,7 @@
         });
         
         popcorn.on("seeked", function() {
-            if (currentseektime !== lastseektime) {
-                currentseektime = lastseektime;
-                popcorn.currentTime(currentseektime / 1000);
-                media.seeking = true;
-            } else {
-                media.trigger("seeked");
-            }
+            media.trigger("seeked");
         });
         
         // Binding UI Events and Mashup Playing to Media
hashcut