From 612fedbb79c7720fdabdb2dd3d80416268ee2825 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 13:31:09 -0700 Subject: [PATCH] added postinstall grunt script --- Dockerfile | 2 +- package.json | 2 +- .../directives/auto-save.client.directive.js | 56 +++++++++---------- .../views/directiveViews/form/edit-form.html | 8 +-- .../views/view-form-submissions.view.html | 48 ---------------- 5 files changed, 31 insertions(+), 85 deletions(-) delete mode 100644 public/modules/forms/views/view-form-submissions.view.html diff --git a/Dockerfile b/Dockerfile index 18dba001..11caf240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # DOCKER-VERSION 1.7.0 -FROM ubuntu:13.10 +FROM ubuntu # make sure apt is up to date RUN apt-get update diff --git a/package.json b/package.json index cd832282..dd6714a0 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "scripts": { "start": "grunt", "test": "grunt test", - "postinstall": "bower install --config.interactive=false" + "postinstall": "bower install --config.interactive=false; ./node_modules/grunt-cli/bin/grunt" }, "dependencies": { "async": "~0.9.0", diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js index 0a6c7c1c..5ee9d4a4 100644 --- a/public/modules/forms/directives/auto-save.client.directive.js +++ b/public/modules/forms/directives/auto-save.client.directive.js @@ -6,6 +6,9 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun require: ['^form'], link: function($scope, $element, $attrs, $ctrls) { + if(!$rootScope.watchCount === undefined){ + $rootScope.watchCount = 0; + } var difference = function(array){ var rest = Array.prototype.concat.apply(Array.prototype, Array.prototype.slice.call(arguments, 1)); @@ -25,56 +28,47 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun var expression = $attrs.autoSaveForm || 'true'; $scope.$on('ngRepeatStarted', function(ngRepeatFinishedEvent) { - // $scope.finishedRender = false; + $scope.finishedRender = false; + $rootScope.watchCount = 0; }); $scope.$on('ngRepeatFinished', function(ngRepeatFinishedEvent) { $scope.finishedRender = true; }); $scope.$watch('myform.form_fields', function(newValue, oldValue) { - // console.log('auto saving'); - console.log(oldValue); - console.log(newValue); + if(difference(oldValue,newValue).length === 0 || oldValue === undefined){ - console.log('returning'); return; } - if(difference(oldValue,newValue).length !== 0 && !$formCtrl.$dirty) { - $formCtrl.$setDirty(); - } - // else if(difference(oldValue.form_fields,newValue.form_fields).length === 0 ){ - // $scope.finishedRender = true; - // } + // console.log('\n\n-------\n$pristine: '+( $formCtrl.$pristine ) ); // console.log('$dirty: '+( $formCtrl.$dirty ) ); // console.log('form_fields changed: '+difference(oldValue.form_fields,newValue.form_fields).length ); // console.log('$valid: '+$formCtrl.$valid); // console.log('finishedRender: '+$scope.finishedRender); // console.log('saveInProgress: '+$scope.saveInProgress); - - if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue,newValue).length !== 0)) { - // console.log('auto saving'); - if(savePromise) { - $timeout.cancel(savePromise); - } - - savePromise = $timeout(function() { - savePromise = null; - - // Still valid? - if(true) { - // console.log('inside'); - - if($scope.$eval(expression) !== false) { - // console.log('Form data persisted -- setting pristine flag'); - $formCtrl.$setPristine(); - // $scope.finishedRender = false; - } + if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue,newValue).length !== 0) ) { + $rootScope.watchCount++; + if($rootScope.watchCount === 1) { + if(savePromise) { + $timeout.cancel(savePromise); } + + savePromise = $timeout(function() { + savePromise = null; + + // Still valid? + // if($formCtrl.$valid) { + if($scope.$eval(expression) !== false) { + console.log('Form data persisted -- setting pristine flag'); + $formCtrl.$setPristine(); + } + // } - }); + }); + } } }, true); diff --git a/public/modules/forms/views/directiveViews/form/edit-form.html b/public/modules/forms/views/directiveViews/form/edit-form.html index 3351dd1b..669eb754 100644 --- a/public/modules/forms/views/directiveViews/form/edit-form.html +++ b/public/modules/forms/views/directiveViews/form/edit-form.html @@ -1,5 +1,5 @@
-
+
@@ -125,7 +125,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/public/modules/forms/views/view-form-submissions.view.html b/public/modules/forms/views/view-form-submissions.view.html deleted file mode 100644 index ccfdb743..00000000 --- a/public/modules/forms/views/view-form-submissions.view.html +++ /dev/null @@ -1,48 +0,0 @@ -
-
-
-

Submissions -
-
- - - View Live Form - - - - -
- -
-
- - - - - - - - - - - - - - -
# - {{key}} -
{{$index+1}} - {{value}} -
- - - Created on - - by - - -

- - -
-
\ No newline at end of file