Skip to content

Commit

Permalink
revved, node modules are working and everything else still seems to b…
Browse files Browse the repository at this point in the history
…e working too
  • Loading branch information
designfrontier committed Sep 25, 2014
1 parent ee9ed6d commit 4004075
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "action",
"version": "0.4.4",
"releaseName": "Akshay Kumar",
"version": "0.5.0",
"releaseName": "Angelina Jolie",
"private": true,
"scripts": {
"start": "node app.js"
Expand All @@ -11,14 +11,21 @@
"ejs": "*"
},
"devDependencies": {
"chai": "^1.9.1",
"gulp": "^3.6.0",
"gulp-concat": "^2.2.0",
"gulp-header": "^1.0.2",
"gulp-jshint": "^1.5.5",
"gulp-karma": "0.0.4",
"gulp-mocha": "^1.1.0",
"gulp-plumber": "^0.6.0",
"gulp-rename": "^1.2.0",
"gulp-uglify": "^0.2.1",
"gulp-watch": "^0.5.4",
"gulp-zip": "^0.3.4"
"gulp-zip": "^0.3.4",
"karma": "^0.12.23",
"karma-chai": "^0.1.0",
"karma-mocha": "^0.1.9",
"mocha": "^1.21.4"
}
}
12 changes: 9 additions & 3 deletions public/javascripts/action.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//TODO routing and pushstate
// view rendering on routing events
(function(exports){
(function(){
'use strict';

var action = {
Expand Down Expand Up @@ -751,5 +751,11 @@
});

//return the tweaked function
exports = action;
})(typeof exports === 'undefined' ? this['action'] = {} : exports);
if (typeof module !== 'undefined') {
// node environment it seems... module.exports this
module.exports = action;
} else {
//looks like a browser put it in the window scope
window.action = action;
}
})();
1 change: 1 addition & 0 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/*
* GET home page.
*/
var action = require('../public/javascripts/action.js');

exports.index = function(req, res){
res.render('index', { title: 'Action! Framework' });
Expand Down

0 comments on commit 4004075

Please sign in to comment.