merged stage into master
This commit is contained in:
commit
d76264fde2
|
@ -51,10 +51,10 @@ var config_nev = function () {
|
||||||
|
|
||||||
}, function(err, options){
|
}, function(err, options){
|
||||||
if(err) throw err;
|
if(err) throw err;
|
||||||
nev.generateTempUserModel(User, function(){
|
return
|
||||||
return;
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
nev.generateTempUserModel(User);
|
||||||
};
|
};
|
||||||
|
|
||||||
config_nev();
|
config_nev();
|
||||||
|
|
|
@ -10,8 +10,9 @@ var config = require('./config'),
|
||||||
module.exports = function (app, db) {
|
module.exports = function (app, db) {
|
||||||
var server = http.createServer(app);
|
var server = http.createServer(app);
|
||||||
|
|
||||||
// Create a new Socket.io server
|
var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
|
||||||
var io = socketio.listen(server);
|
var redis = require('socket.io-redis');
|
||||||
|
io.adapter(redis({ host: '127.0.0.1', port: 6379 }));
|
||||||
|
|
||||||
// Add an event listener to the 'connection' event
|
// Add an event listener to the 'connection' event
|
||||||
io.on('connection', function (socket) {
|
io.on('connection', function (socket) {
|
||||||
|
|
|
@ -84,6 +84,7 @@
|
||||||
"raven": "^0.9.0",
|
"raven": "^0.9.0",
|
||||||
"soap": "^0.11.0",
|
"soap": "^0.11.0",
|
||||||
"socket.io": "^1.4.6",
|
"socket.io": "^1.4.6",
|
||||||
|
"socket.io-redis": "^1.0.0",
|
||||||
"swig": "~1.4.1"
|
"swig": "~1.4.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
15
public/dist/application.js
vendored
15
public/dist/application.js
vendored
|
@ -727,14 +727,22 @@ angular.module('core').service('Menus', [
|
||||||
socket: null
|
socket: null
|
||||||
};
|
};
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
console.log('https://'+window.location.hostname+':'+$window.socketPort);
|
console.log('https://'+window.location.hostname+':'+$window.socketPort);
|
||||||
connect('https://'+window.location.hostname+':'+$window.socketPort);
|
connect('https://'+window.location.hostname+':'+$window.socketPort);
|
||||||
|
=======
|
||||||
|
connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
|
||||||
|
>>>>>>> stage
|
||||||
|
|
||||||
return service;
|
return service;
|
||||||
|
|
||||||
// Connect to Socket.io server
|
// Connect to Socket.io server
|
||||||
function connect(url) {
|
function connect(url) {
|
||||||
|
<<<<<<< HEAD
|
||||||
service.socket = io();
|
service.socket = io();
|
||||||
|
=======
|
||||||
|
service.socket = io({'transports': ['websocket', 'polling']});
|
||||||
|
>>>>>>> stage
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wrap the Socket.io 'emit' method
|
// Wrap the Socket.io 'emit' method
|
||||||
|
@ -1115,7 +1123,10 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
|
||||||
// Create a controller method for sending visitor data
|
// Create a controller method for sending visitor data
|
||||||
function send(form, lastActiveIndex, timeElapsed) {
|
function send(form, lastActiveIndex, timeElapsed) {
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
console.log(lastActiveIndex);
|
console.log(lastActiveIndex);
|
||||||
|
=======
|
||||||
|
>>>>>>> stage
|
||||||
// Create a new message object
|
// Create a new message object
|
||||||
var visitorData = {
|
var visitorData = {
|
||||||
referrer: document.referrer,
|
referrer: document.referrer,
|
||||||
|
@ -1137,7 +1148,11 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
|
||||||
var service = {
|
var service = {
|
||||||
send: send
|
send: send
|
||||||
};
|
};
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> stage
|
||||||
init();
|
init();
|
||||||
return service;
|
return service;
|
||||||
|
|
||||||
|
|
7
public/dist/application.min.js
vendored
7
public/dist/application.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -17,14 +17,13 @@
|
||||||
socket: null
|
socket: null
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log('https://'+window.location.hostname+':'+$window.socketPort);
|
connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
|
||||||
connect('https://'+window.location.hostname+':'+$window.socketPort);
|
|
||||||
|
|
||||||
return service;
|
return service;
|
||||||
|
|
||||||
// Connect to Socket.io server
|
// Connect to Socket.io server
|
||||||
function connect(url) {
|
function connect(url) {
|
||||||
service.socket = io();
|
service.socket = io(url, {'transports': ['websocket', 'polling']});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wrap the Socket.io 'emit' method
|
// Wrap the Socket.io 'emit' method
|
||||||
|
|
27
public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD
Executable file
27
public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD
Executable file
|
@ -0,0 +1,27 @@
|
||||||
|
<div class="field row dropdown" ng-click="setActiveField(field._id, index, true)" ng-if="field.fieldOptions.length > 0">
|
||||||
|
<div class="col-xs-12 field-title" ng-style="{'color': design.colors.questionColor}">
|
||||||
|
<h3>
|
||||||
|
<span class="fa fa-angle-double-right"></span>
|
||||||
|
{{field.title}}
|
||||||
|
<span class="required-error" ng-show="!field.required">{{ 'OPTIONAL' | translate }}</span>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-12 field-input ">
|
||||||
|
<ui-select ng-model="field.fieldValue"
|
||||||
|
theme="selectize"
|
||||||
|
ng-model-options="{ debounce: 250 }"
|
||||||
|
ng-required="field.required"
|
||||||
|
ng-disabled="field.disabled"
|
||||||
|
ng-focus="setActiveField(field._id, index, true)">
|
||||||
|
<ui-select-match placeholder="Type or select an option">
|
||||||
|
{{$select.selected.option_value}}
|
||||||
|
</ui-select-match>
|
||||||
|
<ui-select-choices
|
||||||
|
repeat="option in field.fieldOptions | filter: $select.search"
|
||||||
|
ng-class="{'active': option.option_value === field.fieldValue }">
|
||||||
|
<span ng-bind-html="option.option_value | highlight: $select.search"></span>
|
||||||
|
</ui-select-choices>
|
||||||
|
</ui-select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
|
@ -13,7 +13,6 @@
|
||||||
// Create a controller method for sending visitor data
|
// Create a controller method for sending visitor data
|
||||||
function send(form, lastActiveIndex, timeElapsed) {
|
function send(form, lastActiveIndex, timeElapsed) {
|
||||||
|
|
||||||
console.log(lastActiveIndex);
|
|
||||||
// Create a new message object
|
// Create a new message object
|
||||||
var visitorData = {
|
var visitorData = {
|
||||||
referrer: document.referrer,
|
referrer: document.referrer,
|
||||||
|
@ -35,7 +34,7 @@
|
||||||
var service = {
|
var service = {
|
||||||
send: send
|
send: send
|
||||||
};
|
};
|
||||||
|
|
||||||
init();
|
init();
|
||||||
return service;
|
return service;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue