browserify bundle options fix

puthirith · Mar 3, 2015 · b25f5d6 · b25f5d6
1 parent 62fa678
commit b25f5d6
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 244 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
 node_js:
- - 0.10
+ - 0.12
 before_script:
  - npm install -g grunt-cli
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -78,8 +78,10 @@ module.exports = function(grunt) {
  browserify: {
  build: {
  options: {
- standalone: 'pdfMake',
- alias: './src/browser-extensions/virtual-fs.js:fs'
+ browserifyOptions: {
+ standalone: 'pdfMake',
+ alias: './src/browser-extensions/virtual-fs.js:fs'
+ }
  },
  files: {
  'build/pdfmake.js': ['./src/browser-extensions/pdfMake.js']

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "pdfmake",
- "version": "0.1.15",
+ "version": "0.1.16",
  "homepage": "https://bpampuch.github.io/pdfmake",
  "authors": [
  "Bartek Pampuch <[email protected]>"

diff --git a/build/pdfmake.js b/build/pdfmake.js
diff --git a/build/pdfmake.min.js b/build/pdfmake.min.js
diff --git a/build/pdfmake.min.js.map b/build/pdfmake.min.js.map
diff --git a/tests/layoutBuilder.js b/tests/layoutBuilder.js
@@ -1288,9 +1288,9 @@ describe('LayoutBuilder', function() {
  tableNode.table.body.push([stack1, stack2]);
  }
 
+ new DocMeasure(sampleTestProvider, {}, {}, {}).measureDocument(tableNode);
  ColumnCalculator.buildColumnWidths(tableNode.table.widths, 320);
 
- new DocMeasure(sampleTestProvider, {}, {}, {}).measureDocument(tableNode);
  return tableNode;
  }
 

diff --git a/tests/tableProcessor.js b/tests/tableProcessor.js
@@ -126,7 +126,10 @@ describe('TableProcessor', function () {
  var fakeTableNode = function() {
  return {
  table: {
- widths: ['*']
+ // since extendTableWidths is not called from out tests
+ // we can't use the doc-definition syntax for widths
+ // so instead of '*' we 
+ widths: [ { width: '*' } ]
  },
  _offsets: {
  total: 56472