SVG fixes

Author: louisameline

demo/index.html

@@ -247,6 +247,11 @@
 				.tooltipster({
 					theme: 'tooltipster-shadow'
 				});
+			
+			$('#circle circle').tooltipster({
+				restoration: 'previous'
+			});
+			$('#circle tspan').tooltipster();
 		});
 	</script>
 </head>
@@ -307,6 +312,16 @@
 		SVG
 		<div id="genderChart1"></div>
 		<div id="drawing"></div>
+		<svg id="circle">
+			<text y="20">
+				<tspan x="10" title="line 1">tspan line 1</tspan>
+				<tspan x="10" dy="15" title="line 2">tspan line 2</tspan>
+				<tspan x="10" dy="15" title="line 3">tspan line 3</tspan>
+			</text>
+			<circle cx="150" cy="50" r="40" stroke="black" stroke-width="3" fill="red">
+				<title>Circle</title>
+			</circle>
+		</svg>
 	</section>
 </body>
 </html>

demo/style.css

@@ -36,6 +36,12 @@ body {
 	color: #fff;
 }
 
+#circle {
+	display: block;
+	margin: auto;
+	position: relative;
+}
+
 #genderChart1 {
 	height: 300px;
 	width: 300px;

package.json

@@ -41,5 +41,5 @@
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
-	"version": "4.0.1"
+	"version": "4.0.2"
 }

src/js/plugins/tooltipster/SVG/tooltipster-SVG.js

@@ -25,6 +25,7 @@ $.tooltipster._plugin({
 			var self = this;
 
 			//list of instance variables
+			self.__hadTitleTag = false;
 			self.__instance = instance;
 
 			// jQuery < v3.0's addClass and hasClass do not work on SVG elements.
@@ -44,10 +45,17 @@ $.tooltipster._plugin({
 				// TODO: when there are several <title> tags (not supported in
 				// today's browsers yet though, still an RFC draft), pick the right
 				// one based on its "lang" attribute 
-				var $title = self.__instance._$origin.find('title');
+				var $title = self.__instance._$origin.find('>title');
 
 				if ($title[0]) {
-					self.__instance.content($title.text());
+					
+					var title = $title.text();
+					
+					self.__hadTitleTag = true;
+					self.__instance._$origin.data('tooltipster-initialTitle', title);
+					self.__instance.content(title);
+					
+					$title.remove();
 				}
 			}
 
@@ -83,18 +91,35 @@ $.tooltipster._plugin({
 				})
 				// if jQuery < v3.0, we have to remove the class ourselves
 				._on('destroyed.'+ self.namespace, function() {
-					self.destroy();
+					self.__destroy();
 				});
 		},
 
 		__destroy: function() {
 
-			if (!self.__instance._$origin.hasClass('tooltipstered')) {
-				var c = self.__instance._$origin.attr('class').replace('tooltipstered', '');
-				self.__instance._$origin.attr('class', c);
+			if (!this.__instance._$origin.hasClass('tooltipstered')) {
+				var c = this.__instance._$origin.attr('class').replace('tooltipstered', '');
+				this.__instance._$origin.attr('class', c);
 			}
 
-			self.__instance._off('.'+ self.namespace);
+			this.__instance._off('.'+ this.namespace);
+			
+			// if the content was provided as a title tag, we may need to restore it
+			if (this.__hadTitleTag) {
+				
+				// if a title attribute was restored, we just need to replace it with a tag
+				var title = this.__instance._$origin.attr('title');
+				
+				if (title) {
+					
+					// must be namespaced to work
+					$(document.createElementNS('http://www.w3.org/2000/svg', 'title'))
+						.text(title)
+						.appendTo(this.__instance._$origin);
+					
+					this.__instance._$origin.removeAttr('title');
+				}
+			}
 		}
 	}
 });

src/js/tooltipster.js

@@ -2446,13 +2446,6 @@ $.Tooltipster.prototype = {
 					self.__destroying = false;
 					self.__destroyed = true;
 
-					// last event
-					self._trigger('destroyed');
-					
-					// unbind private and public event listeners
-					self._off();
-					self.off();
-					
 					self._$origin
 						.removeData(self.__namespace)
 						// remove the open trigger listeners
@@ -2506,13 +2499,20 @@ $.Tooltipster.prototype = {
 						}
 					}
 
+					// last event
+					self._trigger('destroyed');
+					
+					// unbind private and public event listeners
+					self._off();
+					self.off();
+					
 					// remove external references, just in case
 					self.__Content = null;
-					self._$origin = null;
 					self.__$emitterPrivate = null;
 					self.__$emitterPublic = null;
-					self._$tooltip = null;
 					self.__options.parent = null;
+					self._$origin = null;
+					self._$tooltip = null;
 
 					// make sure the object is no longer referenced in there to prevent
 					// memory leaks