integration/js/editor.js
changeset 50 89e152523cb6
parent 49 a21b851538b2
child 64 2de3ca9542ed
--- a/integration/js/editor.js	Fri Nov 23 19:13:50 2012 +0100
+++ b/integration/js/editor.js	Mon Nov 26 18:42:56 2012 +0100
@@ -52,8 +52,6 @@
         mashupstatus = '',
         addMode, currentMedia, currentSegment;
         
-        var colors = ["#1f77b4","#ff7f0e","#2ca02c","#d62728","#9467bd","#8c564b","#e377c2","#7f7f7f","#bcbd22","#17becf"];
-    
     IriSP.mashupcore(project, mashup);
     
     /* Validation of segments and mashup */
@@ -197,7 +195,7 @@
                             left : k * _a.begin,
                             width : k * _a.getDuration(),
                             top: 8 * line.index,
-                            color: colors[i % colors.length],
+                            color: IriSP.vizcolors[i % IriSP.vizcolors.length],
                             title: _a.title.replace(replace, '<span style="background: #fc00ff; color: #ffffff;">$1</span>'),
                             popleft : corrpos,
                             pointerpos : (pos - corrpos),
@@ -457,7 +455,7 @@
                 height: 8,
                 top: 8 * line.index,
                 pointerpos : (pos - corrpos),
-                color: colors[i % colors.length]
+                color: IriSP.vizcolors[i % IriSP.vizcolors.length]
             }
             html += mediasegmenttemplate(vizdata);
         });
@@ -873,3 +871,5 @@
     
     mashup.trigger("change");
 }
+
+/* END editor.js */