Merge commit '42b3440853949fefa9de46df7785ef21e5a777a8' into ethereumjs

libjsqrc/ethereumjs/dist/ethereum.js

@@ -1441,10 +1441,11 @@ var web3 = {
         },
 
         /// @param filter may be a string, object or event
-        /// @param indexed is optional, this may be an object with optional event indexed params
-        watch: function (filter, indexed) {
+        /// @param indexed is optional, this is an object with optional event indexed params
+        /// @param options is optional, this is an object with optional event options ('max'...)
+        watch: function (filter, indexed, options) {
             if (filter._isEvent) {
-                return filter(indexed);
+                return filter(indexed, options);
             }
             return new web3.filter(filter, ethWatch);
         }

libjsqrc/ethereumjs/example/event.html

@@ -75,7 +75,13 @@
             });
         };
 
+        function test8() {
+            // "{"topic":["0x83c9849c","000000000000000000000000000000000000000000000000000000000000001e"],"max":100,"address":"0x01"}"
+            web3.eth.watch(contract.Event, {a: 30}, {max: 100}).changed(function (res) {
 
+            });
+        };
+        
         // not valid
         // function testX() {
         //    web3.eth.watch([contract.Event, contract.Event2]).changed(function (res) {
@@ -107,5 +113,8 @@
         <div>
             <button type="button" onClick="test7();">test7</button>
         </div>
+        <div>
+            <button type="button" onClick="test8();">test8</button>
+        </div>
     </body>
 </html>

libjsqrc/ethereumjs/lib/web3.js

@@ -250,10 +250,11 @@ var web3 = {
         },
 
         /// @param filter may be a string, object or event
-        /// @param indexed is optional, this may be an object with optional event indexed params
-        watch: function (filter, indexed) {
+        /// @param indexed is optional, this is an object with optional event indexed params
+        /// @param options is optional, this is an object with optional event options ('max'...)
+        watch: function (filter, indexed, options) {
             if (filter._isEvent) {
-                return filter(indexed);
+                return filter(indexed, options);
             }
             return new web3.filter(filter, ethWatch);
         }