small refactoring

Author: edi9999

coffee/docUtils.coffee

@@ -39,9 +39,6 @@ DocUtils.defaultParser=(tag) ->
 		if tag=='.' then return scope else return scope[tag]
 	}
 
-DocUtils.nl2br = (str,is_xhtml) ->
-	(str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br>' + '$2');
-
 DocUtils.loadDoc= (path,options={}) ->
 	noDocx= if options.docx? then !options.docx else false
 	async=if options.async? then options.async else false
@@ -198,8 +195,7 @@ DocUtils.clone = (obj) ->
 
 DocUtils.xml2Str = (xmlNode) ->
 	a= new XMLSerializer()
-	content= a.serializeToString(xmlNode)
-	content.replace /\x20xmlns=""/g, '' #remove all added xmlns="" (these cause the file to be corrupt and was a problem for firefox)
+	a.serializeToString(xmlNode)
 
 DocUtils.Str2xml= (str,errorHandler) ->
 	parser=new DOMParser({errorHandler})

coffee/docxgen.coffee

@@ -18,12 +18,11 @@ module.exports=class DocxGen
 		@qrCodeNumCallBack=0 #This is the order of the qrcode
 		@qrCodeWaitingFor= [] #The templater waits till all the qrcodes are decoded, This is the list of the remaining qrcodes to decode (only their order in the document is stored)
 		if content? then if content.length>0 then @load(content)
-	setOptions:(@options)->
-		if @options?
-			@intelligentTagging= if @options.intelligentTagging? then @options.intelligentTagging else on
-			@qrCode= if @options.qrCode? then @options.qrCode else off
-			if @qrCode==true then @qrCode=DocUtils.unsecureQrCode
-			if @options.parser? then @parser=options.parser
+	setOptions:(@options={})->
+		@intelligentTagging= if @options.intelligentTagging? then @options.intelligentTagging else on
+		@qrCode= if @options.qrCode? then @options.qrCode else off
+		if @qrCode==true then @qrCode=DocUtils.unsecureQrCode
+		if @options.parser? then @parser=options.parser
 		this
 	loadFromFile:(path,options={})->
 		@setOptions(options)
@@ -79,7 +78,6 @@ module.exports=class DocxGen
 		#When all files have been processed, check if the document is ready
 		@testReady()
 	setData:(fileName,data,options={})->
-		@zip.remove(fileName)
 		@zip.file(fileName,data,options)
 	getTags:()->
 		usedTags=[]