support empty work for new registrations correctly

diff --git a/app/js/controllers.js b/app/js/controllers.js
index b61b852..919e7e0 100644 (file)
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -147,10 +147,13 @@ if(0){//FIXME
                }
        }
 
-       $scope.abstract_class = function(abstract) {
-               return abstract.length <= 2000 ? 'ok' : 'ng-invalid';
+       $scope.abstract_class = function(work) {
+               var abstract = work.abstract;
+               return angular.isString(abstract) && abstract.length <= 2000 ? 'ok' : 'ng-invalid';
        }
-       $scope.abstract_length = function(abstract) {
+       $scope.abstract_length = function(work) {
+               var abstract = work.abstract;
+               if ( ! abstract ) return 0;
                return abstract.length <= 2000 ? abstract.length : 2000 - abstract.length;
        }
 

diff --git a/app/lib/angular-strap b/app/lib/angular-strap
index 85b5ffe..c066848 160000 (submodule)
--- a/app/lib/angular-strap
+++ b/app/lib/angular-strap
@@ -1 +1 @@
-Subproject commit 85b5ffe53911707ba2eb24152a556bce8892eedf
+Subproject commit c0668483b0fa018da5c7be8aa85099104de01cf0

diff --git a/app/partials/registration.html.ep b/app/partials/registration.html.ep
index a7da14d..f65651e 100644 (file)
--- a/app/partials/registration.html.ep
+++ b/app/partials/registration.html.ep
@@ -196,10 +196,10 @@ hr => 'Organizator simpozija' %>
 </div>
 
 <div class="controls-row">
-<label class="{{class = abstract_class(work.abstract)}}">
+<label class="{{class = abstract_class(work)}}">
 <%= locale
-en => 'Abstract ({{abstract_length(work.abstract)}}  from max. 2000 characters with spaces)',
-hr => 'Sažetak ({{abstract_length(work.abstract)}}  od maks. 2000 znakova s razmacima)'
+en => 'Abstract ({{abstract_length(work)}}  from max. 2000 characters with spaces)',
+hr => 'Sažetak ({{abstract_length(work)}}  od maks. 2000 znakova s razmacima)'
 %>
 <textarea class="controls-row span11 {{class}}" ng-model="work.abstract" ng-minlength="2" rows="10" cols="80" ng-required="has_work"></textarea>
 <input type=text ng-model="work.abstract" ng-maxlength="2000" style="display: none">