Commit a603870d a603870d7cf2c29e3df3e1d95fe90bc5168f51ad by Nathan Black

merge from upstream

2 parents 326185dd 6efbbbde
...@@ -129,7 +129,7 @@ var Casper = function Casper(options) { ...@@ -129,7 +129,7 @@ var Casper = function Casper(options) {
129 // factories 129 // factories
130 this.cli = phantom.casperArgs; 130 this.cli = phantom.casperArgs;
131 this.options.logLevel = this.cli.get('log-level', this.options.logLevel); 131 this.options.logLevel = this.cli.get('log-level', this.options.logLevel);
132 if (this.options.verbose === false) { 132 if (!this.options.verbose) {
133 this.options.verbose = this.cli.has('direct') || this.cli.has('verbose'); 133 this.options.verbose = this.cli.has('direct') || this.cli.has('verbose');
134 } 134 }
135 this.colorizer = this.getColorizer(); 135 this.colorizer = this.getColorizer();
......