removed plugin manager

changed event name to match conventions

Author: Flamenco

jspdf.js

@@ -265,7 +265,7 @@ var jsPDF = (function(global) {
 				out('/MediaBox [0 0 ' + f2(wPt) + ' ' + f2(hPt) + ']');
 				out('/Contents ' + (objectNumber + 1) + ' 0 R');
 				// Added for annotation plugin
-				events.publish('render/page', {pageNumber:n,page:pages[n]});
+				events.publish('putPage', {pageNumber:n,page:pages[n]});
 				out('>>');
 				out('endobj');
 
@@ -1768,7 +1768,6 @@ var jsPDF = (function(global) {
 		// Add the first page automatically
 		addFonts();
 		activeFontKey = 'F1';
-		jsPDF.plugins.internal.onInitialize(API);
 		_addPage(format, orientation);
 
 		events.publish('initialized');
@@ -1803,28 +1802,13 @@ var jsPDF = (function(global) {
 	 */
 	jsPDF.API = {events:[]};
 	jsPDF.version = "1.0.0-trunk";
+
 	if (typeof define === 'function' && define.amd) {
 		define('jsPDF', function() {
 			return jsPDF;
 		});
 	} else {
 		global.jsPDF = jsPDF;
 	}
-	jsPDF.plugins = {
-		register:function(plugin){
-			this.internal.plugins.push(plugin);
-		},
-		internal:{
-			plugins:[],
-			onInitialize: function(pdf){
-				for (var i = 0; i < this.plugins.length; i++) {
-					var plugin = this.plugins[i];
-					if (typeof plugin.onInitialize === 'function'){
-						plugin.onInitialize.call(plugin, pdf);
-					}
-				}
-			},
-		}
-	};
 	return jsPDF;
 }(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this));

jspdf.plugin.annotations.js

@@ -37,70 +37,63 @@ function notEmpty(obj) {
 	'use strict';
 
 	var annotationPlugin = {
-		onInitialize : function(pdf) {
-			this.installAnnotationPlugin(pdf);
-		}
-	};
-	jsPDF.API.annotationPlugin = annotationPlugin;
-	jsPDF.plugins.register(annotationPlugin);
-
-	annotationPlugin.installAnnotationPlugin = function(pdf) {
-
-		this.annotations = [];
 
-		// TODO remove this after we find a way to subscribe before the
-		// first page is created.
-		//this.annotations[1] = [];
+		/**
+		 * An array of arrays, indexed by <em>pageNumber</em>.
+		 */
+		annotations : [],
 
-		this.f2 = function(number) {
+		f2 : function(number) {
 			return number.toFixed(2);
-		};
-
-		pdf.internal.events.subscribe('addPage', function(info) {
-			this.annotationPlugin.annotations[info.pageNumber] = [];
-		});
+		}
+	};
 
-		pdf.internal.events.subscribe('render/page', function(info) {
-			var pageAnnos = this.annotationPlugin.annotations[info.pageNumber];
+	jsPDF.API.annotationPlugin = annotationPlugin;
 
-			var found = false;
-			for (var a = 0; a < pageAnnos.length; a++) {
-				var anno = pageAnnos[a];
-				if (anno.type === 'link') {
-					if (notEmpty(anno.options.url) || notEmpty(anno.options.pageNumber)) {
-						found = true;
-						break;
+	jsPDF.API.events.push([
+			'addPage', function(info) {
+				this.annotationPlugin.annotations[info.pageNumber] = [];
+			}
+	]);
+
+	jsPDFAPI.events.push([
+			'putPage', function(info) {
+				var pageAnnos = this.annotationPlugin.annotations[info.pageNumber];
+
+				var found = false;
+				for (var a = 0; a < pageAnnos.length; a++) {
+					var anno = pageAnnos[a];
+					if (anno.type === 'link') {
+						if (notEmpty(anno.options.url) || notEmpty(anno.options.pageNumber)) {
+							found = true;
+							break;
+						}
 					}
 				}
-			}
-			if (found == false) {
-				return;
-			}
+				if (found == false) {
+					return;
+				}
 
-			this.internal.write("/Annots [");
-			var f2 = this.annotationPlugin.f2;
-			for (var a = 0; a < pageAnnos.length; a++) {
-				var anno = pageAnnos[a];
-				var k = this.internal.scaleFactor;
-				var pageHeight = this.internal.pageSize.height;
-				var rect = "/Rect [" + f2(anno.x * k) + " " + f2((pageHeight - anno.y) * k) + " " + f2(anno.x + anno.w * k) + " " + f2(pageHeight - (anno.y + anno.h) * k) + "] ";
-				if (anno.options.url) {
-					this.internal.write('<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /A <</S /URI /URI (' + anno.options.url + ') >> >>')
-				} else if (anno.options.pageNumber) {
-					// first page is 0
-					this.internal.write('<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /Dest [' + (anno.options.pageNumber - 1) + ' /XYZ 0 ' + pageHeight + ' 0] >>')
-				} else {
-					// TODO error - should not be here
+				this.internal.write("/Annots [");
+				var f2 = this.annotationPlugin.f2;
+				for (var a = 0; a < pageAnnos.length; a++) {
+					var anno = pageAnnos[a];
+					var k = this.internal.scaleFactor;
+					var pageHeight = this.internal.pageSize.height;
+					var rect = "/Rect [" + f2(anno.x * k) + " " + f2((pageHeight - anno.y) * k) + " " + f2(anno.x + anno.w * k) + " " + f2(pageHeight - (anno.y + anno.h) * k) + "] ";
+					if (anno.options.url) {
+						this.internal.write('<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /A <</S /URI /URI (' + anno.options.url + ') >> >>')
+					} else if (anno.options.pageNumber) {
+						// first page is 0
+						this.internal.write('<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /Dest [' + (anno.options.pageNumber - 1) + ' /XYZ 0 ' + pageHeight + ' 0] >>')
+					} else {
+						// TODO error - should not be here
+					}
 				}
+				this.internal.write("]");
 			}
-			this.internal.write("]");
-		});
-	};
+	]);
 
-	/**
-	 * An array of arrays, indexed by <em>pageNumber</em>.
-	 */
-	// this.internal.annotations = [];
 	/**
 	 * valid options
 	 * <li> pageNumber or url [required]
@@ -132,16 +125,19 @@ function notEmpty(obj) {
 		return this;
 	};
 
+	//TODO move into external library
 	jsPDFAPI.getTextWidth = function(text) {
 		'use strict';
 		var fontSize = this.internal.getFontSize();
 		var txtWidth = this.getStringUnitWidth(text) * fontSize / this.internal.scaleFactor;
 		return txtWidth;
 	};
 
+	//TODO move into external library
 	jsPDFAPI.getLineHeight = function() {
 		return this.internal.getLineHeight();
 	};
 
 	return this;
+
 })(jsPDF.API);