fixed onFinishRender bug
This commit is contained in:
parent
28a8eabba9
commit
f7ba6a2df6
|
@ -58,17 +58,11 @@ config_nev();
|
||||||
var smtpTransport = nodemailer.createTransport(config.mailer.options);
|
var smtpTransport = nodemailer.createTransport(config.mailer.options);
|
||||||
|
|
||||||
exports.validateVerificationToken = function(req, res){
|
exports.validateVerificationToken = function(req, res){
|
||||||
// console.log('validateVerificationToken');
|
|
||||||
// console.log('token: '+req.params.token+'\n\n');
|
|
||||||
|
|
||||||
console.log('res.headerSent: '+res.headersSent);
|
|
||||||
nev.confirmTempUser(req.params.token, function(err, user) {
|
nev.confirmTempUser(req.params.token, function(err, user) {
|
||||||
if(err) {
|
if(err) {
|
||||||
console.log(errorHandler.getErrorMessage(err));
|
console.log(errorHandler.getErrorMessage(err));
|
||||||
console.log(err)
|
|
||||||
return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
|
return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (user){
|
else if (user){
|
||||||
return res.status(200).send('User successfully verified');
|
return res.status(200).send('User successfully verified');
|
||||||
}else {
|
}else {
|
||||||
|
|
|
@ -31,7 +31,7 @@ var newDemoTemplate = {
|
||||||
officialLanguage: 'English',
|
officialLanguage: 'English',
|
||||||
phone: '250-',
|
phone: '250-',
|
||||||
phone2: '',
|
phone2: '',
|
||||||
postal: "S4M 7T8",
|
postal: 'S4M 7T8',
|
||||||
province: 'BC',
|
province: 'BC',
|
||||||
sex: 'F',
|
sex: 'F',
|
||||||
sexDesc: 'Female',
|
sexDesc: 'Female',
|
||||||
|
|
12
package.json
12
package.json
|
@ -28,17 +28,6 @@
|
||||||
"chalk": "~1.1.1",
|
"chalk": "~1.1.1",
|
||||||
"compression": "~1.6.0",
|
"compression": "~1.6.0",
|
||||||
"connect-flash": "~0.1.1",
|
"connect-flash": "~0.1.1",
|
||||||
<<<<<<< HEAD
|
|
||||||
"connect-mongo": "~0.8.1",
|
|
||||||
"consolidate": "~0.10.0",
|
|
||||||
"cookie-parser": "~1.3.2",
|
|
||||||
"email-verification": "whitef0x0/node-email-verification",
|
|
||||||
"express": "~4.10.1",
|
|
||||||
"express-session": "~1.9.1",
|
|
||||||
"forever": "~0.11.0",
|
|
||||||
"fs-extra": "~0.18.3",
|
|
||||||
"glob": "~4.0.5",
|
|
||||||
=======
|
|
||||||
"connect-mongo": "~0.8.2",
|
"connect-mongo": "~0.8.2",
|
||||||
"consolidate": "~0.13.1",
|
"consolidate": "~0.13.1",
|
||||||
"cookie-parser": "~1.4.0",
|
"cookie-parser": "~1.4.0",
|
||||||
|
@ -48,7 +37,6 @@
|
||||||
"forever": "~0.15.1",
|
"forever": "~0.15.1",
|
||||||
"fs-extra": "~0.26.2",
|
"fs-extra": "~0.26.2",
|
||||||
"glob": "~5.0.15",
|
"glob": "~5.0.15",
|
||||||
>>>>>>> draggable_fields
|
|
||||||
"grunt": "~0.4.1",
|
"grunt": "~0.4.1",
|
||||||
"grunt-cli": "~0.1.13",
|
"grunt-cli": "~0.1.13",
|
||||||
"grunt-concurrent": "~2.0.4",
|
"grunt-concurrent": "~2.0.4",
|
||||||
|
|
|
@ -43,9 +43,11 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope
|
||||||
$scope.myforms.splice(form_index+1, 0, data);
|
$scope.myforms.splice(form_index+1, 0, data);
|
||||||
}).error(function(errorResponse){
|
}).error(function(errorResponse){
|
||||||
console.error(errorResponse);
|
console.error(errorResponse);
|
||||||
if(errorResponse == null) $scope.error = errorResponse.data.message;
|
if(errorResponse === null){
|
||||||
|
$scope.error = errorResponse.data.message;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
// Create new Form
|
// Create new Form
|
||||||
$scope.createNewForm = function(){
|
$scope.createNewForm = function(){
|
||||||
|
@ -76,9 +78,7 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope
|
||||||
$http.delete('/forms/'+$scope.myforms[form_index]._id)
|
$http.delete('/forms/'+$scope.myforms[form_index]._id)
|
||||||
.success(function(data, status, headers){
|
.success(function(data, status, headers){
|
||||||
console.log('form deleted successfully');
|
console.log('form deleted successfully');
|
||||||
|
|
||||||
$scope.myforms.splice(form_index, 1);
|
$scope.myforms.splice(form_index, 1);
|
||||||
|
|
||||||
}).error(function(error){
|
}).error(function(error){
|
||||||
console.log('ERROR: Form could not be deleted.');
|
console.log('ERROR: Form could not be deleted.');
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
|
|
@ -26,6 +26,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
|
||||||
|
|
||||||
$rootScope.finishedRender = false;
|
$rootScope.finishedRender = false;
|
||||||
$scope.$on('editFormFields Started', function(ngRepeatFinishedEvent) {
|
$scope.$on('editFormFields Started', function(ngRepeatFinishedEvent) {
|
||||||
|
// console.log('hello');
|
||||||
$rootScope.finishedRender = false;
|
$rootScope.finishedRender = false;
|
||||||
});
|
});
|
||||||
$scope.$on('editFormFields Finished', function(ngRepeatFinishedEvent) {
|
$scope.$on('editFormFields Finished', function(ngRepeatFinishedEvent) {
|
||||||
|
@ -97,6 +98,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
|
||||||
// console.log('oldValue: '+oldValue);
|
// console.log('oldValue: '+oldValue);
|
||||||
// console.log(oldValue.form_fields);
|
// console.log(oldValue.form_fields);
|
||||||
// console.log(newValue.form_fields);
|
// console.log(newValue.form_fields);
|
||||||
|
|
||||||
if(oldValue.form_fields.length === 0) {
|
if(oldValue.form_fields.length === 0) {
|
||||||
$rootScope.finishedRender = true
|
$rootScope.finishedRender = true
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ angular.module('forms').directive('fieldDirective', ['$templateCache', '$http',
|
||||||
|
|
||||||
|
|
||||||
var getTemplateUrl = function(field) {
|
var getTemplateUrl = function(field) {
|
||||||
console.log(field.validFieldTypes);
|
|
||||||
var type = field.fieldType;
|
var type = field.fieldType;
|
||||||
var templateUrl = 'modules/forms/views/directiveViews/field/';
|
var templateUrl = 'modules/forms/views/directiveViews/field/';
|
||||||
var supported_fields = [
|
var supported_fields = [
|
||||||
|
|
|
@ -5,10 +5,8 @@ angular.module('forms').directive('onFinishRender', function ($rootScope, $timeo
|
||||||
restrict: 'A',
|
restrict: 'A',
|
||||||
link: function (scope, element, attrs) {
|
link: function (scope, element, attrs) {
|
||||||
|
|
||||||
// $rootScope.$broadcast(' Started');
|
|
||||||
|
|
||||||
//Don't do anything if we don't have a ng-repeat on the current element
|
//Don't do anything if we don't have a ng-repeat on the current element
|
||||||
if(!element.attr('ng-repeat')){
|
if(!element.attr('ng-repeat') && !element.attr('data-ng-repeat')){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
<form class="row container" name="editForm" auto-save-form auto-save-watch="myform" auto-save-callback="update">
|
<form class="row container" name="editForm" auto-save-form auto-save-watch="myform" auto-save-callback="update">
|
||||||
|
|
||||||
<div class="col-xs-2 col-sm-4 col-md-5 add-field">
|
<div class="col-xs-2 col-sm-4 col-md-5 add-field">
|
||||||
|
|
Loading…
Reference in a new issue