Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
rchipka committed Aug 29, 2016
2 parents 1f31bcc + 446263e commit fc29b42
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/Command.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var Data = require('./Data.js'),
URL = require('url'),
fs = require('fs'),
qs = require('querystring'),
formFunctions = require('./form-functions.js'),
formFunctions = require('./Form.js'),
cmdDir = __dirname + '/commands/';

/**
Expand Down Expand Up @@ -361,7 +361,7 @@ Command.prototype.request = function (method, context, href, params, callback) {

opts.proxy = proxies[proxies.index];
}

instance.queueRequest(url, opts,
function (err, res, document) {
if (err !== null) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/commands/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @see {@link Command.fail}
*/

var form = require('../form-functions.js');
var form = require('../Form.js');

function Login(context, data, next, done) {
var user = this.args[0],
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/paginate.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @instance
*/

var form = require('../form-functions.js');
var form = require('../Form.js');

function Paginate(context, data, next, done) {
var selector = this.selector,
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/submit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @instance
*/

var form = require('../form-functions.js');
var form = require('../Form.js');

function Submit(context, data, next, done) {
var node = context.get(this.selector),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "osmosis",
"version": "1.0.2",
"version": "1.1.0",
"description": "Web scraper for NodeJS",
"keywords": [
"web",
Expand Down

0 comments on commit fc29b42

Please sign in to comment.