From: riccardo <riccardo@parisson.com>
Date: Tue, 29 Mar 2011 17:40:41 +0000 (+0200)
Subject: django playlists load improvenment (work in progress)
X-Git-Tag: 1.1~316
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cc9f7a5a40078a4769e266acfb98f490825cece5;p=telemeta.git

django playlists load improvenment (work in progress)
---

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index c35fa0c1..fd7c0cfb 100644
--- 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 b24c79cd..cb59878e 100644
--- 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 7bc39292..e29ae858 100644
--- 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 61a96d53..65ce4749 100644
--- 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 %}