merged
This commit is contained in:
commit
3cd4c2395c
|
@ -51,10 +51,10 @@ var config_nev = function () {
|
|||
|
||||
}, function(err, options){
|
||||
if(err) throw err;
|
||||
nev.generateTempUserModel(User, function(){
|
||||
return;
|
||||
});
|
||||
return
|
||||
});
|
||||
|
||||
nev.generateTempUserModel(User);
|
||||
};
|
||||
|
||||
config_nev();
|
||||
|
|
21
config/env/all.js
vendored
21
config/env/all.js
vendored
|
@ -83,30 +83,17 @@ module.exports = {
|
|||
'public/*.js',
|
||||
'public/modules/*/*.js',
|
||||
'public/modules/*/*/*.js',
|
||||
'public/modules/**/*.js',
|
||||
'public/modules/**/gruntfile.js',
|
||||
'public/modules/**/demo/**/*.js',
|
||||
'public/modules/**/dist/**/*.js',
|
||||
'public/modules/**/node_modules/**/*.js',
|
||||
'public/modules/**/tests/**/*.js'
|
||||
'public/modules/**/*.js'
|
||||
],
|
||||
views: [
|
||||
'public/modules/**/*.html',
|
||||
'public/modules/**/demo/**/*.html',
|
||||
'public/modules/**/dist/**/*.html',
|
||||
'public/modules/**/node_modules/**/*.html',
|
||||
'public/modules/**/tests/**/*.html'
|
||||
'public/modules/**/*.html'
|
||||
],
|
||||
unit_tests: [
|
||||
'public/lib/angular-mocks/angular-mocks.js',
|
||||
'public/modules/*/tests/unit/**/*.js',
|
||||
'public/modules/**/demo/**/*.js',
|
||||
'public/modules/**/node_modules/**/*.js'
|
||||
'public/modules/*/tests/unit/**/*.js'
|
||||
],
|
||||
e2e_tests: [
|
||||
'public/modules/*/tests/e2e/**.js',
|
||||
'public/modules/**/demo/**/*.js',
|
||||
'public/modules/**/node_modules/**/*.js'
|
||||
'public/modules/*/tests/e2e/**.js'
|
||||
]
|
||||
}
|
||||
};
|
||||
|
|
|
@ -10,8 +10,9 @@ var config = require('./config'),
|
|||
module.exports = function (app, db) {
|
||||
var server = http.createServer(app);
|
||||
|
||||
// Create a new Socket.io server
|
||||
var io = socketio.listen(server);
|
||||
var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
|
||||
var redis = require('socket.io-redis');
|
||||
io.adapter(redis({ host: '127.0.0.1', port: 6379 }));
|
||||
|
||||
// Add an event listener to the 'connection' event
|
||||
io.on('connection', function (socket) {
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
"raven": "^0.9.0",
|
||||
"soap": "^0.11.0",
|
||||
"socket.io": "^1.4.6",
|
||||
"socket.io-redis": "^1.0.0",
|
||||
"swig": "~1.4.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
2910
public/dist/application.js
vendored
2910
public/dist/application.js
vendored
File diff suppressed because one or more lines are too long
10
public/dist/application.min.js
vendored
10
public/dist/application.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -17,14 +17,13 @@
|
|||
socket: null
|
||||
};
|
||||
|
||||
console.log('https://'+window.location.hostname+':'+$window.socketPort);
|
||||
connect('https://'+window.location.hostname+':'+$window.socketPort);
|
||||
connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
|
||||
|
||||
return service;
|
||||
|
||||
// Connect to Socket.io server
|
||||
function connect(url) {
|
||||
service.socket = io();
|
||||
service.socket = io(url, {'transports': ['websocket', 'polling']});
|
||||
}
|
||||
|
||||
// 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
|
||||
function send(form, lastActiveIndex, timeElapsed) {
|
||||
|
||||
console.log(lastActiveIndex);
|
||||
// Create a new message object
|
||||
var visitorData = {
|
||||
referrer: document.referrer,
|
||||
|
@ -35,7 +34,7 @@
|
|||
var service = {
|
||||
send: send
|
||||
};
|
||||
|
||||
|
||||
init();
|
||||
return service;
|
||||
|
||||
|
|
Loading…
Reference in a new issue