Allow to override the options during the takeShot callback

.gitignore

@@ -1,3 +1,7 @@
 *.swp
 node_modules
-.ds_store
+.ds_store
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+*.iml
+.idea/

README.md

@@ -248,6 +248,23 @@ var options = {
 };
 ```
 
+### Override options in takeShotOnCallback
+When using the takeShotOnCallback option, the page can override the options by
+providing an object instead of the string as follows:
+
+```javascript
+window.callPhantom({
+    event: 'takeShot',
+    options: {
+        shotSize: {
+            width: document.getElementsByTagName('html')[0].offsetWidth,
+            height: document.getElementsByTagName('html')[0].offsetHeight
+        }
+    }
+});
+```
+In this example the shot size will be set to the real size of the document.
+
 ## Tests
 Tests are written with [Mocha](http://visionmedia.github.com/mocha/) and can be
 run with `npm test`. The tests use [node-imagemagick](http://github.com/rsms/node-imagemagick) and thus require

lib/webshot.phantom.js

@@ -70,13 +70,18 @@ optUtils.phantomPage.forEach(function(key) {
 });
 
 // The function that actually performs the screen rendering
-var _takeScreenshot = function(status) {
+var _takeScreenshot = function(status, optionsOverride) {
   if (status === 'fail') {
     page.close();
     phantom.exit(1);
     return;
   }
 
+  if (typeof optionsOverride == 'object') {
+    var assign = require('object.assign').getPolyfill();
+    assign(options, optionsOverride);
+  }
+
   // Wait `options.renderDelay` seconds for the page's JS to kick in
   window.setTimeout(function () {
 
@@ -136,6 +141,9 @@ if (options.onCallback && options.takeShotOnCallback) {
     if (data == 'takeShot') {
       _takeScreenshot();
     }
+    else if (data.event == 'takeShot') {
+      _takeScreenshot(null, data.options);
+    }
   };
 } else if (options.onLoadFinished && !options.takeShotOnCallback) {
   takeScreenshot = function(status) {

package.json

@@ -11,6 +11,10 @@
     {
       "name": "Matthew Chase Whittemore",
       "email": "[email protected]"
+    },
+    {
+      "name": "Sergey Fayngold",
+      "email": "[email protected]"
     }
   ],
   "license": "MIT",
@@ -22,8 +26,9 @@
     "node >=0.7.00"
   ],
   "dependencies": {
-    "graceful-fs": "~3.0.4",
     "cross-spawn": "^0.2.3",
+    "graceful-fs": "~3.0.4",
+    "object.assign": "^4.0.3",
     "tmp": "~0.0.25"
   },
   "optionalDependencies": {