Merge branch 'master' into 1.x

Conflicts:
	coffee/docxgen.coffee

Author: edi9999

docs/source/conf.py

@@ -52,10 +52,6 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '0.5.4'
-# The full version, including alpha/beta/rc tags.
-release = '0.5.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -248,7 +244,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'docxtemplater', u'docxtemplater Documentation',
-   u'Edgar Hipp', 'docxtemplater', 'One line description of project.',
+   u'Edgar Hipp', 'docxtemplater', 'Generate docx documents from docx templates',
    'Miscellaneous'),
 ]
 

docs/source/configuration.rst

@@ -25,7 +25,7 @@ So I decided to use the qrCode format, which is a format that lets you identify
 
 The option for this is `qrCode` (false for off, a function for on, default off)
 
-The function takes two parameter: The first one is the string, the second the callback.
+The function takes two parameter: The first one is the string that was decoded by the qrcode module, the second the callback.
 
 For example your configuration could be:
 
@@ -53,13 +53,13 @@ For example your configuration could be:
 
 .. note::
 
-    If you don't use that functionality, you should disable it, because it is quite slow (the image decoding)
+    If you don't use that functionality, you should not enable it (you don't have to do anything), because the qrcode module is quite slow.
 
 .. warning::
 
     The qrCode functionality only works for PNG !
     They is no support for other file formats yet.
-    The main problem being that their is no decoder for other file formats in Node.js 
+    The main problem being that their is no decoder for other file formats in Node.js.
     The library https://github.com/zhangyuanwei/node-images does support decoding for more file formats (gif, png, jpeg), but depends on 3 other none node dependencies.
 
 .. warning::
@@ -108,16 +108,14 @@ https://github.com/Automattic/node-canvas/wiki
     canvas.pngStream().pipe(fs.createWriteStream('qr.png'));
 
 
-Angular Parser
+Custom Parser
 --------------
 
-The name of this option `parser` (function).
-
-You can set the angular parser with the following code:
+The name of this option is `parser` (function).
 
 With a custom parser you can parse the tags to for example add operators
 like '+', '-', or whatever the way you want to parse expressions. See for
-a complete reference of all possibilities
+a complete reference of all possibilities of angularjs parsing:
 http://teropa.info/blog/2014/03/23/angularjs-expressions-cheatsheet.html
 
 To enable this, you need to specify a custom parser.
@@ -131,6 +129,7 @@ docxtemplater comes shipped with this parser:
     {
         return {
             get:function(scope) {
+                if (expression===".") return scope;
                 return scope[expression]
             }
         };
@@ -157,7 +156,7 @@ To use the angular-parser, do the following:
 Intelligent LoopTagging
 -----------------------
 
-The name of this option `intelligentTagging` (boolean).
+The name of this option is `intelligentTagging` (boolean).
 
 When looping over an element, docxtemplater needs to know over which
 element you want to loop. By default, it tries to do that intelligently

docs/source/full_doc.rst

@@ -137,26 +137,6 @@ Docxgen methods
 
         This requires to include Downloadify.js, that needs flash version 10. Have a look at the *output* function if you don't want to depend on it. This function has the advantage that it works regardless of the file size
 
-    getImageList()
-
-        this gets all images that have one of the following extension: 'gif','jpeg','jpg','emf','png'
-        Return format: Array of Object:
-        [{path:string,files:ZipFile Object}]
-
-        You should'nt call this method before calling **applyTags()**, because applyTags can modify the images or their path when replacing images with other (particularly when qrCode is set to true, which is not the default case). You can call this method after **applyTags()** without any problems
-
-    setImage(path,imgData)
-
-        path
-            Type:"String"
-            Path of the image, given by getImageList()
-        imgData
-            Type:"String"
-            imgData in txt/plain
-
-        This sets the image given by a path and an imgData in txt/plain.
-        You should'nt call this method before calling **applyTags()**, because applyTags can modify the images or their path when replacing images with other (particularly when qrCode is set to true, which is not the default case). You can call this method after **applyTags()** without any problems
-
     getFullText:([path])
 
         path

docs/source/installation.rst

@@ -35,6 +35,7 @@ I recommend you to use browserify.
     npm install -g gulp jasmine-node uglify-js
     npm install
     gulp allCoffee
+    mkdir build -p
     browserify -r './js/docxgen.js' > build/docxgen.js
     uglifyjs build/docxgen.js > build/docxgen.min.js
 

docs/source/platform_support.rst

@@ -17,36 +17,9 @@ Internet explorer is not supported -even IE10- (basically because xhr Requests c
 
 You can test if everything works fine on your browser by using the test runner: http://javascript-ninja.fr/docxgenjs/test/SpecRunner.html
 
-Firefox has an other implementation of the xml parser, that's why all tests don't pass now.
-However, all of the functionality works on Firefox too.
-The output files are not exactly the same byte wise but the generated XML is correct.
-
 Dependencies
 ============
 
 1. **docxgen.js** uses [jszip.js](http://stuk.github.io/jszip/) to zip and unzip the docx files
 
 2. Optionally, if you want to be able to name the output files, you can use **Downloadify.js**, which is required to use method download. Be informed that it uses flash, this is why the method is not recommended. This method is howewer useful because a lot of browsers are limited for the download size with the Data-URI method. **Update**: I will probably implement in the future a way to use the FileSaver API, with [FileSaverJS](http://eligrey.com/demos/FileSaver.js/)
-
-3. Optionnaly, if you want to replace images by images situated at a particular URL, you can use QR codes. For example If you store an image at http://website.com/image.png , you should encode the URL in QR-Code format. ![Qr Code Sample](http://qrfree.kaywa.com/?l=1&s=8&d=http%3A%2F%2Fwebsite.com%2Fimage.png "Qrcode Sample to http://website.com/image.png"). You can even use bracket tags in images. http://website.com/image.png?color={color} will take the *Tags[color]* variable to make a dynamic URL. For this too work, you will need [jsqrcode](http://github.com/edi9999/jsqrcode "jsqrcode repositoty forked") and include the following files, in this order (only for browser support, node support already comes out of the box):
-
-
-.. code-block:: javascript
-
-    <script type="text/javascript" src="grid.js"></script>
-    <script type="text/javascript" src="version.js"></script>
-    <script type="text/javascript" src="detector.js"></script>
-    <script type="text/javascript" src="formatinf.js"></script>
-    <script type="text/javascript" src="errorlevel.js"></script>
-    <script type="text/javascript" src="bitmat.js"></script>
-    <script type="text/javascript" src="datablock.js"></script>
-    <script type="text/javascript" src="bmparser.js"></script>
-    <script type="text/javascript" src="datamask.js"></script>
-    <script type="text/javascript" src="rsdecoder.js"></script>
-    <script type="text/javascript" src="gf256poly.js"></script>
-    <script type="text/javascript" src="gf256.js"></script>
-    <script type="text/javascript" src="decoder.js"></script>
-    <script type="text/javascript" src="qrcode.js"></script>
-    <script type="text/javascript" src="findpat.js"></script>
-    <script type="text/javascript" src="alignpat.js"></script>
-    <script type="text/javascript" src="databr.js"></script>

package.json

@@ -23,14 +23,14 @@
     "url": "https://github.com/edi9999/docxtemplater"
   },
   "dependencies": {
-    "angular-expressions": "~0.2.1",
     "jszip": "^2.4.0",
     "png-js": "^0.1.1",
     "qrcode-reader": "0.0.5",
     "url": "^0.10.1",
     "xmldom": "0.1.x"
   },
   "devDependencies": {
+    "angular-expressions": "~0.2.1",
     "gulp": "~3.8.0",
     "gulp-browserify": "^0.5.0",
     "gulp-coffee": "~2.0.1",