0.2.0 with patch

jolic · Mar 4, 2015 · 278b41e · 278b41e
1 parent 843387f
commit 278b41e
Showing 1 changed file with 80 additions and 24 deletions.
diff --git a/_PATCH/js/dev/vivus-0.2.0_PATCH.js b/_PATCH/js/dev/vivus-0.2.0_PATCH.js
@@ -294,14 +294,28 @@ function Vivus (element, options, callback) {
 
   // Setup
   this.isReady = false;
-  this.setElement(element);
-  this.setOptions(options);
-  this.setCallback(callback);
+  // _init must be called as a callback function because:
+  // if Vivus needs to create an <object> the initialization 
+  // has to be done after the content has been loaded
+  var self = this;
+  this.options = options;
+  var _init = function(){
+	self.setOptions(options);
+	self.setCallback(callback);
+	if (self.isReady) {
+		self.init();
+	}
+  };
+  // in case of an <object> setElement returns false
+  // in case of any other element it returns true so the _init has to be called
+  if ( ! this.setElement(element, _init) ){
+  	_init();
+  }
+
 
-  if (this.isReady) {
-    this.init();
-  }
 }
+// is needed as Vivus.prototype.setOptions requires options.file
+Vivus.prototype.options = null;
 
 /**
  * Timing functions
@@ -330,23 +344,47 @@ Vivus.EASE_IN  = function (x) {return Math.pow(x, 3);};
  *
  * @param {DOM|String}   element  SVG Dom element or id of it
  */
-Vivus.prototype.setElement = function (element) {
+Vivus.prototype.setElement = function (element, _callback) {
+// returns true if addEventListener is called (in case of <object>)
+// returns false in case of any other element
+	var _return = false;
   // Basic check
   if (typeof element === 'undefined') {
     throw new Error('Vivus [constructor]: "element" parameter is required');
   }
 
+	var self = this;
+	var addLoadListener = function( _cb ){ // _cb = callback
+		// If we have to wait for it
+		element.addEventListener('load', function (evt) {
+			//self.el = evt.target.contentDocument.querySelector('svg');
+			var target = evt.target.contentDocument;
+			var svgElements = target.getElementsByTagName('svg');
+			if ( 0 === svgElements.length ) {
+				throw new Error('Vivus [constructor]: object loaded does not contain any SVG');
+			}
+			else {
+				self.el = svgElements[0];
+				self.isReady = true;
+				_cb();
+			}
+		});
+	};
+
   // Set the element
   if (element.constructor === String) {
     element = document.getElementById(element);
+/*
     if (!element) {
       throw new Error('Vivus [constructor]: "element" parameter is not related to an existing ID');
     }
+*/
   }
 
   switch (element.constructor) {
   case SVGSVGElement:
   case SVGElement:
+
     this.el = element;
     this.isReady = true;
     break;
@@ -356,26 +394,44 @@ Vivus.prototype.setElement = function (element) {
     this.el = element.contentDocument.querySelector('svg');
     if (this.el) {
       this.isReady = true;
-      return;
     }
-
-    // If we have to wait for it
-    var self = this;
-    element.addEventListener('load', function () {
-      self.el = element.contentDocument.querySelector('svg');
-      if (!self.el) {
-        throw new Error('Vivus [constructor]: object loaded does not contain any SVG');
-      }
-      else {
-        self.isReady = true;
-        self.init();
-      }
-    });
+	else {
+		_return = true;
+		addLoadListener(_callback);
+	}
     break;
-
   default:
-    throw new Error('Vivus [constructor]: "element" parameter must be a string or a SVGelement');
+	if ( typeof this.options.file !== 'undefined' ){
+		var objElm = document.createElement('object');
+		objElm.setAttribute('type', 'image/svg+xml');
+		objElm.setAttribute('data', this.options.file);
+		element.appendChild(objElm);
+		element = objElm;
+		_return = true;
+		addLoadListener(_callback);
+	}
+	else {
+		throw new Error('Vivus [constructor]: To add an <object> on this element at least options.file must be defined!');
+	}
+  }
+  return _return;
+};
+
+Vivus.prototype.getTypes = function() {
+	return ['delayed', 'async', 'oneByOne', 'scenario', 'scenario-sync'];
+};
+Vivus.prototype.setType = function (type) {
+  var allowedTypes = this.getTypes();
+  // Set the animation type
+  if (type && allowedTypes.indexOf(type) === -1) {
+    throw new Error('Vivus [constructor]: ' + type + ' is not an existing animation `type`');
   }
+  else {
+    this.type = type || allowedTypes[0];
+  }
+  this.map=[];
+  this.mapping();
+  return this;
 };
 
 /**
@@ -386,7 +442,7 @@ Vivus.prototype.setElement = function (element) {
  * @param  {object} options Object from the constructor
  */
 Vivus.prototype.setOptions = function (options) {
-  var allowedTypes = ['delayed', 'async', 'oneByOne', 'scenario', 'scenario-sync'];
+  var allowedTypes = this.getTypes();
   var allowedStarts =  ['inViewport', 'manual', 'autostart'];
 
   // Basic check