Skip to content

Commit

Permalink
Version 1.1.58
Browse files Browse the repository at this point in the history
  • Loading branch information
dgofman committed Aug 24, 2015
1 parent c7558e6 commit 5eacdc6
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 114 deletions.
4 changes: 2 additions & 2 deletions indigo.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ var indigo =

var app = this.app = express();

app.use(require(this.appconfPath('server:parser:path') || './libs/parser')(appconf)); //enabled req.body
require(this.appconfPath('server:parser:path') || './libs/parser')(app, appconf); //enabled req.body

app.use(require(this.appconfPath('server:session:path') || './libs/session')(appconf)); //enabled req.session
require(this.appconfPath('server:session:path') || './libs/session')(app, appconf); //enabled req.session

this.static('/', webdir);

Expand Down
87 changes: 46 additions & 41 deletions libs/parser.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@
'use strict';

var bodyParser = require('body-parser');

/**
* Default module for the initialization of <code>req.body</code> request attribute.
* For initialization of custom parsing module locate the path to the new library.
*
* @example
* conf/app.json
*{
*
* "server": {
* ...
* "parser": {
* "path": null
* }
* ...
* }
*}
*
* @version 1.0
*
* @module
* @mixin libs/parser
*
* @return {express.bodyParser} bodyParser JSON request parameters.
*
* @see {@link libs/parser.js}
* @see {@link https://www.npmjs.com/package/body-parser}
*
* @requires body-parser
*/
function parser() {
return bodyParser.json();
}

/**
* @module parser
* @see {@link libs/parser}
*/
'use strict';

var bodyParser = require('body-parser');

/**
* Default module for the initialization of <code>req.body</code> request attribute.
* For initialization of custom parsing module locate the path to the new library.
*
* @example
* conf/app.json
*{
*
* "server": {
* ...
* "parser": {
* "path": null
* }
* ...
* }
*}
*
* @version 1.0
*
* @module
* @mixin libs/parser
*
* @param {express} app Instance of the application server.
* @param {Object} appconf An application configuration.
*
* @see {@link libs/parser.js}
* @see {@link https://www.npmjs.com/package/body-parser}
*
* @requires body-parser
*/
function parser(app, appconf) {
// parse application/x-www-form-urlencoded
app.use(bodyParser.urlencoded({ extended: appconf.get('server:parser:extended') || false }));

// parse application/json
app.use(bodyParser.json());
}

/**
* @module parser
* @see {@link libs/parser}
*/
module.exports = parser;
98 changes: 49 additions & 49 deletions libs/session.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
'use strict';

var expressSession = require('express-session');

/**
* Default module for the initialization of <code>req.session</code> request attribute.
* For initialization of custom session module locate the path to the new library.
* For security reason recommending update the default <code>session-key</code> value.
*
* @example
* conf/app.json
*{
*
* "server": {
* ...
* "session": {
* "session-key": "indigojs-session",
* "path": null
* }
* ...
* }
*}
*
* @version 1.0
*
* @module
* @mixin libs/session
*
* @param {Object} appconf An application configuration.
* @return {express-session} expressSession Instance to the <code>express-session</code> module.
*
* @see {@link libs/session.js}
* @see {@link https://www.npmjs.com/package/express-sessions}
*
* @requires express-session
*/
function session(appconf) {
var opts = {
secret: appconf.get('server:session:session-key') || 'key_' + new Date().getTime(),
resave: true,
saveUninitialized: true
};
return expressSession(opts);
}

/**
* @module session
* @see {@link libs/session}
*/
'use strict';

var expressSession = require('express-session');

/**
* Default module for the initialization of <code>req.session</code> request attribute.
* For initialization of custom session module locate the path to the new library.
* For security reason recommending update the default <code>session-key</code> value.
*
* @example
* conf/app.json
*{
*
* "server": {
* ...
* "session": {
* "session-key": "indigojs-session",
* "path": null
* }
* ...
* }
*}
*
* @version 1.0
*
* @module
* @mixin libs/session
*
* @param {express} app Instance of the application server.
* @param {Object} appconf An application configuration.
*
* @see {@link libs/session.js}
* @see {@link https://www.npmjs.com/package/express-sessions}
*
* @requires express-session
*/
function session(app, appconf) {
var opts = {
secret: appconf.get('server:session:session-key') || 'key_' + new Date().getTime(),
resave: true,
saveUninitialized: true
};
app.use(expressSession(opts));
}

/**
* @module session
* @see {@link libs/session}
*/
module.exports = session;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "indigojs",
"version": "1.1.57",
"version": "1.1.58",
"description": "IndigoJS is an open source, JavaScript/NodeJS localization framework",
"main": "indigo.js",
"scripts": {
Expand Down
27 changes: 14 additions & 13 deletions test/unittest/libs/session.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use strict';

var session = require('../../../libs/session');

describe('libs/session', function () {

it('should generate default session key', function (done) {
session({ get: function() {
return null;
}});
done();
});
});
'use strict';

var session = require('../../../libs/session');

describe('libs/session', function () {

it('should generate default session key', function (done) {
session({ use: function() {} }, //app
{ get: function() { //appconf
return null;
}});
done();
});
});
20 changes: 12 additions & 8 deletions tools/generator/web/static/js/utils/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,21 @@ define([
},

close_tooltip: function(timeout, indigo_tooltip) {
active = active || indigo_tooltip;
clearInterval(active.interval);
if (active) {
clearInterval(active.interval);
if (indigo_tooltip) {
active.css('display', 'none');
} else {
active.interval = setInterval(function() {
clearInterval(active.interval);
active.css('display', 'none');
}, timeout);
}
}

if (indigo_tooltip) {
active.css('display', 'none');
indigo_tooltip.css('display', 'block');
active = indigo_tooltip;
} else {
active.interval = setInterval(function() {
clearInterval(active.interval);
active.css('display', 'none');
}, timeout);
}
}
};
Expand Down

0 comments on commit 5eacdc6

Please sign in to comment.