# HG changeset patch # User cavaliet # Date 1405436781 -7200 # Node ID 2dea6f70975c848122e08753c13583bba01d6230 # Parent 5f60cf9d2fb9a6c62bfdae4daacb6e76459e8fab v0.5.26 correct player diff -r 5f60cf9d2fb9 -r 2dea6f70975c .hgignore --- a/.hgignore Tue Jul 15 16:58:58 2014 +0200 +++ b/.hgignore Tue Jul 15 17:06:21 2014 +0200 @@ -12,3 +12,6 @@ \.mp4$ \.pyc$ ^sbin/sync/config.py$ + +syntax: regexp +^web/static/media/cache$ \ No newline at end of file diff -r 5f60cf9d2fb9 -r 2dea6f70975c src/spel/__init__.py --- a/src/spel/__init__.py Tue Jul 15 16:58:58 2014 +0200 +++ b/src/spel/__init__.py Tue Jul 15 17:06:21 2014 +0200 @@ -1,4 +1,4 @@ -VERSION = (0, 5, 24, "final", 0) +VERSION = (0, 5, 26, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r 5f60cf9d2fb9 -r 2dea6f70975c src/spel/static/spel/metadataplayer/MultiSegments.js --- a/src/spel/static/spel/metadataplayer/MultiSegments.js Tue Jul 15 16:58:58 2014 +0200 +++ b/src/spel/static/spel/metadataplayer/MultiSegments.js Tue Jul 15 17:06:21 2014 +0200 @@ -103,7 +103,7 @@ currentLine = undefined; } IriSP._(lines).each(function(line) { - if($j(e.target).parent().parent()[0]==line.segmentWidget[0]){ + if(IriSP.jQuery(e.target).parent().parent()[0]==line.segmentWidget[0]){ currentLine = line; line.show(); } else {