# HG changeset patch # User cavaliet # Date 1382453102 -7200 # Node ID 862239f18df052155714fc96befef5c4a45727e7 # Parent f581c73aded625a47e8a4c8af9c9b6ac791502fd debugs and version number 1.51.8 diff -r f581c73aded6 -r 862239f18df0 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Thu Oct 17 14:49:15 2013 +0200 +++ b/src/ldt/ldt/__init__.py Tue Oct 22 16:45:02 2013 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 51, 7, "final", 0) +VERSION = (1, 51, 8, "final", 0) def get_version(): diff -r f581c73aded6 -r 862239f18df0 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Thu Oct 17 14:49:15 2013 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Tue Oct 22 16:45:02 2013 +0200 @@ -157,7 +157,6 @@ {% if createannotation %},{ type: "CreateAnnotation", api_endpoint_template: "{% absurl 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}", - api_method: "PUT", after_send_timeout: 8000, {% if tag_titles or tag_titles == "" %} tag_titles : tag_titles_array, diff -r f581c73aded6 -r 862239f18df0 src/ldt/ldt/static/ldt/js/projectscontents.js --- a/src/ldt/ldt/static/ldt/js/projectscontents.js Thu Oct 17 14:49:15 2013 +0200 +++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Oct 22 16:45:02 2013 +0200 @@ -93,65 +93,63 @@ // remove all qtip $(".qtip").remove(); - if(target.val()) { - if(target.val().length > 0) { - target.nextAll(".searchclear").show(); - } - - target.next(".searchajaxloader").show(); - target.nextAll(".searchclear").hide(); - //var filterVal = "_" + encodeURIComponent(target.realVal()); - var filterVal = "_" + encodeURIComponent(target.val()); - url = url.replace('__FILTER__',filterVal); - url = url.replace('__ID_GROUP__',$('#id_group').val()); - var data_obj = null; - if(num_page || tag_filter){ - data_obj = {}; - if(num_page){ - data_obj["num_page"] = num_page; - } - if(tag_filter){ - data_obj["tag_filter"] = tag_filter; - } - } - if(data_obj!=null){ - $.ajax({ - url: url, - cache: false, - type: 'GET', - data: data_obj, - success: function(data, status, request) { - $(container_selector).html(data); - target.next(".searchajaxloader").hide(); - //if(target.realVal().length > 0) { - if(target.val().length > 0) { - target.nextAll(".searchclear").show(); - } - init_events($(container_selector)); - target.removeAttr('timer'); - }, - error: function(jqXHR, textStatus, errorThrown) { - resp = $.parseJSON(jqXHR.responseText); - alert(resp.message); - } - }); - } - else{ - $.ajax({ - url: url, - cache: false, - success: function(data, status, request) { - $(container_selector).html(data); - target.next(".searchajaxloader").hide(); - //if(target.realVal().length > 0) { - if(target.val().length > 0) { - target.nextAll(".searchclear").show(); - } - init_events($(container_selector)); - target.removeAttr('timer'); - } - }); - } + if(target && target.val() && (target.val().length > 0)){ + target.nextAll(".searchclear").show(); + } + + target.next(".searchajaxloader").show(); + target.nextAll(".searchclear").hide(); + //var filterVal = "_" + encodeURIComponent(target.realVal()); + var filterVal = "_" + encodeURIComponent(target.val()); + url = url.replace('__FILTER__',filterVal); + url = url.replace('__ID_GROUP__',$('#id_group').val()); + var data_obj = null; + if(num_page || tag_filter){ + data_obj = {}; + if(num_page){ + data_obj["num_page"] = num_page; + } + if(tag_filter){ + data_obj["tag_filter"] = tag_filter; + } + } + if(data_obj!=null){ + $.ajax({ + url: url, + cache: false, + type: 'GET', + data: data_obj, + success: function(data, status, request) { + $(container_selector).html(data); + target.next(".searchajaxloader").hide(); + //if(target.realVal().length > 0) { + if(target.val().length > 0) { + target.nextAll(".searchclear").show(); + } + init_events($(container_selector)); + target.removeAttr('timer'); + }, + error: function(jqXHR, textStatus, errorThrown) { + resp = $.parseJSON(jqXHR.responseText); + alert(resp.message); + } + }); + } + else{ + $.ajax({ + url: url, + cache: false, + success: function(data, status, request) { + $(container_selector).html(data); + target.next(".searchajaxloader").hide(); + //if(target.realVal().length > 0) { + if(target.val().length > 0) { + target.nextAll(".searchclear").show(); + } + init_events($(container_selector)); + target.removeAttr('timer'); + } + }); } } diff -r f581c73aded6 -r 862239f18df0 src/ldt/ldt/static/ldt/metadataplayer/Polemic.js --- a/src/ldt/ldt/static/ldt/metadataplayer/Polemic.js Thu Oct 17 14:49:15 2013 +0200 +++ b/src/ldt/ldt/static/ldt/metadataplayer/Polemic.js Tue Oct 22 16:45:02 2013 +0200 @@ -67,13 +67,12 @@ this.$zone.append(this.$elapsed); + // we don't filter with null duration anymore var _slices = [], _slice_count = Math.floor( this.width / this.element_width ), _duration = this.source.getDuration(), _max = 0, - _list = this.getWidgetAnnotations().filter(function(_a) { - return !_a.getDuration().milliseconds; - }), + _list = this.getWidgetAnnotations(), _this = this; for (var _i = 0; _i < _slice_count; _i++) {