beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed onFinishRender bug

Browse source
This commit is contained in:
David Baldwynn 2015-11-06 09:41:55 -08:00
parent 28a8eabba9
commit f7ba6a2df6
8 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/users.authentication.server.controller.js
View file

@ -58,17 +58,11 @@ config_nev();
var smtpTransport = nodemailer.createTransport(config.mailer.options);
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) {
if(err) {
console.log(errorHandler.getErrorMessage(err));
console.log(err)
return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
}
else if (user){
return res.status(200).send('User successfully verified');
}else {

2
app/models/form_submission.server.model.js
View file

@ -31,7 +31,7 @@ var newDemoTemplate = {
officialLanguage: 'English',
phone: '250-',
phone2: '',
postal: "S4M 7T8",
postal: 'S4M 7T8',
province: 'BC',
sex: 'F',
sexDesc: 'Female',

12
package.json
View file

@ -28,17 +28,6 @@
"chalk": "~1.1.1",
"compression": "~1.6.0",
"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",
"consolidate": "~0.13.1",
"cookie-parser": "~1.4.0",
@ -48,7 +37,6 @@
"forever": "~0.15.1",
"fs-extra": "~0.26.2",
"glob": "~5.0.15",
>>>>>>> draggable_fields
"grunt": "~0.4.1",
"grunt-cli": "~0.1.13",
"grunt-concurrent": "~2.0.4",

8
public/modules/forms/controllers/list-forms.client.controller.js
View file

@ -43,9 +43,11 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope
$scope.myforms.splice(form_index+1, 0, data);
}).error(function(errorResponse){
console.error(errorResponse);
if(errorResponse == null) $scope.error = errorResponse.data.message;
if(errorResponse === null){
$scope.error = errorResponse.data.message;
}
});
}
};
// Create new Form
$scope.createNewForm = function(){
@ -76,9 +78,7 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope
$http.delete('/forms/'+$scope.myforms[form_index]._id)
.success(function(data, status, headers){
console.log('form deleted successfully');
$scope.myforms.splice(form_index, 1);
}).error(function(error){
console.log('ERROR: Form could not be deleted.');
console.error(error);

2
public/modules/forms/directives/auto-save.client.directive.js
View file

@ -26,6 +26,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
$rootScope.finishedRender = false;
$scope.$on('editFormFields Started', function(ngRepeatFinishedEvent) {
// console.log('hello');
$rootScope.finishedRender = false;
});
$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.form_fields);
// console.log(newValue.form_fields);
if(oldValue.form_fields.length === 0) {
$rootScope.finishedRender = true
}

1
public/modules/forms/directives/field.client.directive.js
View file

@ -13,7 +13,6 @@ angular.module('forms').directive('fieldDirective', ['$templateCache', '$http',
var getTemplateUrl = function(field) {
console.log(field.validFieldTypes);
var type = field.fieldType;
var templateUrl = 'modules/forms/views/directiveViews/field/';
var supported_fields = [

4
public/modules/forms/directives/on-finish-render.client.directive.js
View file

@ -5,10 +5,8 @@ angular.module('forms').directive('onFinishRender', function ($rootScope, $timeo
restrict: 'A',
link: function (scope, element, attrs) {
// $rootScope.$broadcast(' Started');
//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;
}

1
public/modules/forms/views/directiveViews/form/edit-form.client.view.html
View file

@ -1,4 +1,3 @@
<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">