added some track->event restrictions

secretrobotron · Jun 20, 2011 · 39649a8 · 39649a8
1 parent d49d4f9
commit 39649a8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/index.html b/index.html
@@ -25,11 +25,11 @@
           restrictToKnownPlugins: true,
         });
 
-        trackline.createTrack('Track1').createTrackEvent( 'default', { start: 1, end: 5, label: 'awesome' } );
-        trackline.createTrack('Track2').createTrackEvent( 'default', { start: 0, end: 2,
+        trackline.createTrack('Should\'t Work').createTrackEvent( 'default', { start: 1, end: 5, label: 'awesome' } );
+        trackline.createTrack('Should Work 1', 'default').createTrackEvent( { start: 0, end: 2,
           classes: ['test-class'],
         });
-        trackline.createTrack('Track3').createTrackEvent( 'default', { 
+        trackline.createTrack('Should Work 2', 'default').createTrackEvent( 'default', { 
           start: 4, 
           end: 7,
           css: {

diff --git a/trackliner.js b/trackliner.js
@@ -77,10 +77,10 @@
         eventCount = 0;
       };
 
-      this.createTrack = function( name ) {
+      this.createTrack = function( name, type ) {
 
         //index = ~index || ~trackArray.length;
-        var track = new Track(),
+        var track = new Track( name, type ),
             element = track.getElement();
 
         container.appendChild( element );
@@ -146,12 +146,23 @@
 
       this.setScale(scale);
 
-      var Track = function(inc) {
+      var Track = function( name, type ) {
 
         var trackId = "trackLiner" + trackCount++,
             events = {},
             that = this,
-            element = document.createElement( "div" );
+            element = document.createElement( "div" ),
+            pluginType = typeof(type) === 'string' ? (restrictToKnownPlugins && plugins[ type ] ? type : undefined) : (restrictToKnownPlugins ? undefined : 'default'),
+            pluginDef = plugins[ type ],
+            name = name || trackId;
+
+        this.name = function () {
+          return name;
+        }; //name
+
+        this.type = function () {
+          return pluginType;
+        };
 
         element.className = 'trackliner-track';
         element.id = trackId;
@@ -222,9 +233,20 @@
           var trackEvent = {},
               eventId = "trackEvent" + eventCount++,
               inputOptions = typeof(type) === 'string' ? inputOptions : type,
-              type = typeof(type) === 'string' ? type : (restrictToKnownPlugins ? undefined : 'default'),
-              pluginDef = plugins[ type ];
-
+              pluginDef;
+
+          if ( pluginType ) {
+            type = ( pluginType === type || typeof( type ) === 'object' ) ? pluginType : undefined;
+          }
+          else if ( restrictToKnownPlugins ) {
+            type = undefined;
+          }
+          else {
+            type = 'default';
+          } //if 
+
+          pluginDef = plugins[ type ];
+
           if (pluginDef) {
 
             var trackOptions = plugins[ type ].setup( that, inputOptions, event, ui );