django playlists load improvenment (work in progress)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index c35fa0c1564af77cace47f4aa77290790352583b..fd7c0cfbd987d0497824dff37a1f2af86cb3372d 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1016,17 +1016,17 @@ a.image-link {
 
 .button,  .button:visited, .button:hover{
     font-weight: bold;
-    border-top:  2px solid #e9e9e9 !important;
-    border-left:  2px solid #e9e9e9 !important;
-    border-right:  2px solid #e9e9e9 !important;
-    border-bottom:  2px solid #e9e9e9 !important;
+    border-top:  1px solid #e1e1e1 !important;
+    border-left:  1px solid #e1e1e1 !important;
+    border-right:  1px solid #e1e1e1 !important;
+    border-bottom:  1px solid #e1e1e1 !important;
 }
 
 .button:hover{
-    border-top:  2px solid #f9f9f9 !important;
-    border-left:  2px solid #f9f9f9 !important;
-    border-bottom:  2px solid #999 !important;
-    border-right:  2px solid #999 !important;
+    border-top:  1px solid #f9f9f9 !important;
+    border-left:  1px solid #f9f9f9 !important;
+    border-bottom:  1px solid #999 !important;
+    border-right:  1px solid #999 !important;
     background-color:  #f4f4f4; /*#e9e9d9;*/
     color: #000; /*#6A0307;*/
 }

diff --git a/telemeta/htdocs/timeside/src/player.js b/telemeta/htdocs/timeside/src/player.js
index b24c79cd65796e5b4fc67905cfdb33457c21a84a..cb59878e4084441b3ba2ab7f2489dc297b10298c 100644 (file)
--- a/telemeta/htdocs/timeside/src/player.js
+++ b/telemeta/htdocs/timeside/src/player.js
@@ -237,9 +237,18 @@ TimeSide(function($N, $J) {
             if (this.map) {
                 var position = parseFloat(this.soundProvider.getPosition());
                 var idx = this.map.insertionIndex(position);
-                if(idx>=0){ //the pointer is exactly on a marker, increase by one
-                    //otherwise the index is the marker itself and we wouldn't move ahead
-                    idx++;
+                if(idx>=0){ //the pointer is exactly on a marker, the index is the marker itself
+                    //so increase by one otherwise  and we wouldn't move ahead
+                    //more specifically, increase as long as we have markers with this offset (there could be more than
+                    //one marker at offset
+                    var m = this.map.get(idx);
+                    while(m && m.offset == position){
+                        idx++;
+                        m = this.map.get(idx);
+                        if(!m){
+                            idx=-1;
+                        }
+                    }
                 }else{
                     //we are not on a pointer, get the index of the marker
                     //(see markermap insertionindex)

diff --git a/telemeta/htdocs/timeside/src/playlist.js b/telemeta/htdocs/timeside/src/playlist.js
index 7bc392920e7808cee0879f4fb389a11d9091a402..e29ae858922382ec61d055c764a5716eee713bfd 100644 (file)
--- a/telemeta/htdocs/timeside/src/playlist.js
+++ b/telemeta/htdocs/timeside/src/playlist.js
@@ -1,6 +1,13 @@
 
 
 var playlistUtils = {
+    playlists : {},
+    initialize: function(dictionary){
+        this.playlists = dictionary;
+    },
+    addPlayList: function(name, id){
+        this.playlists[name]=id;
+    },
     
     //    add : function(event){
     //

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 61a96d53e72c28d6fea0624b150de3253723f00b..65ce4749e021a97b74edf60e201acf7c4d6b612d 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -29,6 +29,9 @@
         var content = $('#_popup_add_to_playlist').clone(true,true);
         $('#_add_to_playlist').click(function(e){return popup.show(content,e)});
     });
+
+
+    
 </script>
 
 {% endblock %}