Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix dev code for webpack compatibility #149

Merged
merged 3 commits into from
Jun 27, 2018
Merged

fix dev code for webpack compatibility #149

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
662f4e1
fix dev code for webpack compatibility
Jun 25, 2018
3df0f39
add node to .jshinrc
Jun 25, 2018
5da0ade
use 4 for indent_size
Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
[*]
end_of_line = LF
indent_style = tab
indent_size = 4
indent_size = 2
Copy link
Contributor

@justinbmeyer justinbmeyer Jun 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we use tabs for indentation except in package.json and other similar configs.

Copy link
Member Author

@cherifGsoul cherifGsoul Jun 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I changed the indent_size only! 2 is not what it is used?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 is what is used.

3 changes: 2 additions & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"yui": true,
"browser": true,
"phantom": true,
"rhino": true
"rhino": true,
"node": true
}
6 changes: 4 additions & 2 deletions core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ exports.callDynamicFixture = function(xhrSettings, fixtureSettings, cb){
xhrSettings.data = fixtureSettings.data;

//!steal-remove-start
var json = JSON.stringify(xhrSettings.data);
canLog.log("" + xhrSettings.type.toUpperCase() + " " + xhrSettings.url+" "+json.substr(0,50)+" -> handler(req,res)");
if(process.env.NODE_ENV !== 'production') {
var json = JSON.stringify(xhrSettings.data);
canLog.log("" + xhrSettings.type.toUpperCase() + " " + xhrSettings.url+" "+json.substr(0,50)+" -> handler(req,res)");
}
//!steal-remove-end

var response = function(){
Expand Down