fixes paths for windows

This commit is contained in:
Ryan Day 2016-08-16 06:29:29 -07:00
parent 49b26ef099
commit afc6486f29
4 changed files with 15 additions and 13 deletions

View file

@ -1,7 +1,7 @@
#!/usr/bin/env node
try{
var qr = require(__dirname+'/../qrcode.js');
var qr = require('../qrcode.js');
} catch (e) {
qr = require('qrcode');
}

View file

@ -9,8 +9,8 @@
*
*/
var QRCodeLib = require(__dirname+'/lib/qrcode-draw')
, terminalRender = require(__dirname+'/lib/termialrender.js')
var QRCodeLib = require('./lib/qrcode-draw')
, terminalRender = require('./lib/termialrender.js')
, Canvas = require('canvas')
, fs = require('fs');

View file

@ -1,5 +1,5 @@
var QRCode = require(__dirname+'/../qrcode.js');
var QRCode = require('../qrcode.js');
QRCode.drawAscii('yo yo yo',function(error,data){
QRCode.drawText('yo yo yo',function(error,data){
console.log(data);
});

View file

@ -1,20 +1,22 @@
var express = require('express')
,app = express.createServer()
,fs = require('fs')
,QRCode = require(__dirname+'/../qrcode')
,QRCode = require('../qrcode')
,canvasutil = require('canvasutil')
,Canvas = require('canvas')
,Image = Canvas.Image;
var path = require('path')
app.configure(function(){
app.use(express.methodOverride());
app.use(express.bodyParser());
app.use(app.router);
app.use(express.static(__dirname + '/../'));
app.use(express.static(path.resolve(__dirname,'..')));
});
app.get('/', function(req, res){
fs.readFile(__dirname+'/clientside.html', function (err, data) {
fs.readFile(path.join(__dirname,'clientside.html'), function (err, data) {
res.send(data?data.toString():err);
});
});
@ -53,22 +55,22 @@ app.get('/generate', function(req, res){
});
effectHandlers.node = function(args,cb){
args.src = __dirname+'/fixtures/node_logo.png';
this.image(args,cb);
args.src = path.join(__dirname,'fixtures','node_logo.png');
this.image(path.join(args,cb);
};
effectHandlers.npm = function(args,cb){
args.src = __dirname+'/fixtures/npm_logo.png';
args.src = path.join(__dirname,'fixtures','npm_logo.png');
this.image(args,cb);
};
effectHandlers.bacon = function(args,cb){
args.src = __dirname+'/fixtures/bacon-love.png';
args.src = path.join(__dirname,'fixtures','bacon-love.png');
this.image(args,cb);
};
effectHandlers.baconBikini = function(args,cb){
args.src = __dirname+'/fixtures/bacon-bikini.png';
args.src = path.join(__dirname,'fixtures','bacon-bikini.png');
this.image(args,cb);
};