Updated the JessyInk extensions to version 1.5.5.

(bzr r9877)

11 files changed, 23 insertions, 11 deletions

diff --git a/share/extensions/jessyInk.js b/share/extensions/jessyInk.js
index 0e5683008..78b4bf896 100755
--- a/share/extensions/jessyInk.js
+++ b/share/extensions/jessyInk.js
@@ -1373,6 +1373,18 @@ function slideUpdateExportLayer()
 	{
 		var nd = nodesToBeRemoved[ndCounter];
 
+		// Before removing the node, check whether it contains any definitions.
+		var defs = nd.getElementsByTagNameNS(NSS["svg"], "defs");
+
+		for (var defsCounter = 0; defsCounter < defs.length; defsCounter++)
+		{
+			if (defs[defsCounter].id)
+			{
+				newDoc.appendChild(defs[defsCounter].cloneNode(true));
+			}
+		}
+
+		// Remove node.
 		nd.parentNode.removeChild(nd);
 	}
 
@@ -1418,7 +1430,7 @@ function slideUpdateExportLayer()
 
 	var xml = serializer.serializeToStream(newDoc, strm, 'UTF-8');
 
-	window.open('data:image/svg+xml;base64;charset=utf-8,' + window.btoa(strm.content), '_blank');
+	window.location = 'data:application/svg+xml;base64;charset=utf-8,' + window.btoa(strm.content);
 
 	// Unsuspend redraw.
 	ROOT_NODE.unsuspendRedraw(suspendHandle);
diff --git a/share/extensions/jessyInk_autoTexts.py b/share/extensions/jessyInk_autoTexts.py
index 57566888f..cf41ad24f 100755
--- a/share/extensions/jessyInk_autoTexts.py
+++ b/share/extensions/jessyInk_autoTexts.py
@@ -40,7 +40,7 @@ class JessyInk_AutoTexts(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_effects.py b/share/extensions/jessyInk_effects.py
index 336d0ee4e..3af909bb2 100755
--- a/share/extensions/jessyInk_effects.py
+++ b/share/extensions/jessyInk_effects.py
@@ -45,7 +45,7 @@ class JessyInk_Effects(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_install.py b/share/extensions/jessyInk_install.py
index 331b2d232..f1e951ec6 100755
--- a/share/extensions/jessyInk_install.py
+++ b/share/extensions/jessyInk_install.py
@@ -60,7 +60,7 @@ class JessyInk_Install(inkex.Effect):
 		scriptElm = inkex.etree.Element(inkex.addNS("script", "svg"))
 		scriptElm.text = open(os.path.join(os.path.dirname(__file__),	"jessyInk.js")).read()
 		scriptElm.set("id","JessyInk")
-		scriptElm.set("{" + inkex.NSS["jessyink"] + "}version", '1.5.4')
+		scriptElm.set("{" + inkex.NSS["jessyink"] + "}version", '1.5.5')
 		self.document.getroot().append(scriptElm)
 
 		# Remove "jessyInkInit()" in the "onload" attribute, if present.
diff --git a/share/extensions/jessyInk_keyBindings.py b/share/extensions/jessyInk_keyBindings.py
index 3f2ed34e9..110ca3355 100755
--- a/share/extensions/jessyInk_keyBindings.py
+++ b/share/extensions/jessyInk_keyBindings.py
@@ -182,7 +182,7 @@ class	JessyInk_CustomKeyBindings(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_masterSlide.py b/share/extensions/jessyInk_masterSlide.py
index 41f0f8c71..c29922d94 100755
--- a/share/extensions/jessyInk_masterSlide.py
+++ b/share/extensions/jessyInk_masterSlide.py
@@ -40,7 +40,7 @@ class JessyInk_MasterSlide(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_mouseHandler.py b/share/extensions/jessyInk_mouseHandler.py
index f35a65bf5..4eff4c467 100755
--- a/share/extensions/jessyInk_mouseHandler.py
+++ b/share/extensions/jessyInk_mouseHandler.py
@@ -42,7 +42,7 @@ class	JessyInk_CustomMouseHandler(inkex.Effect):
 		
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_summary.py b/share/extensions/jessyInk_summary.py
index f4b3d8d38..48478c41e 100755
--- a/share/extensions/jessyInk_summary.py
+++ b/share/extensions/jessyInk_summary.py
@@ -58,7 +58,7 @@ class JessyInk_Summary(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_transitions.py b/share/extensions/jessyInk_transitions.py
index 779532168..18cd3f880 100755
--- a/share/extensions/jessyInk_transitions.py
+++ b/share/extensions/jessyInk_transitions.py
@@ -44,7 +44,7 @@ class JessyInk_Transitions(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_video.py b/share/extensions/jessyInk_video.py
index 222670b35..51c73494b 100755
--- a/share/extensions/jessyInk_video.py
+++ b/share/extensions/jessyInk_video.py
@@ -43,7 +43,7 @@ class JessyInk_Effects(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))
diff --git a/share/extensions/jessyInk_view.py b/share/extensions/jessyInk_view.py
index ba9c4a686..04adc27ae 100755
--- a/share/extensions/jessyInk_view.py
+++ b/share/extensions/jessyInk_view.py
@@ -61,7 +61,7 @@ class JessyInk_Effects(inkex.Effect):
 
 	def effect(self):
 		# Check version.
-		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.4']", namespaces=inkex.NSS)
+		scriptNodes = self.document.xpath("//svg:script[@jessyink:version='1.5.5']", namespaces=inkex.NSS)
 
 		if len(scriptNodes) != 1:
 			inkex.errormsg(_("The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n\n"))