2 commits - public_html/js public_html/skins

Aleksander Machniak machniak at kolabsys.com
Tue Jul 10 14:14:52 CEST 2012


 public_html/js/kolab_admin.js       |   10 +++++++++-
 public_html/skins/default/style.css |    6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 34bfb106f2164400882fabb54e92036bf1466cea
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Tue Jul 10 14:14:25 2012 +0200

    Fix maxcount for lists with autocompletion

diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index 8859cc4..24dea51 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -853,6 +853,7 @@ function kolab_admin()
           span = $(this.parentNode.parentNode),
           maxcount = $('textarea[name="'+name+'"]').attr('data-maxcount');
 
+        // check element count limit
         if (maxcount && maxcount <= span.parent().children().length) {
           alert(kadm.t('form.maxcount.exceeded'));
           return;
@@ -895,11 +896,18 @@ function kolab_admin()
       dt = (new Date()).getTime(),
       span = $(input.parentNode),
       name = input.name.replace(/\[-1\]$/, ''),
-      af = kadm.env.assoc_fields;
+      af = kadm.env.assoc_fields,
+      maxcount = $('textarea[name="'+name+'"]').attr('data-maxcount');
 
     // reset autocomplete input
     input.value = '';
 
+    // check element count limit
+    if (maxcount && maxcount <= span.parent().children().length - 1) {
+      alert(kadm.t('form.maxcount.exceeded'));
+      return;
+    }
+
     // check if element doesn't exist on the list already
     if (!af[name])
       af[name] = {};


commit a4f7bc4e82ca4bc8a3f1bf12e630864876fd0574
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Tue Jul 10 14:02:38 2012 +0200

    Small style fix

diff --git a/public_html/skins/default/style.css b/public_html/skins/default/style.css
index e5ef4f8..d5ede27 100644
--- a/public_html/skins/default/style.css
+++ b/public_html/skins/default/style.css
@@ -586,16 +586,16 @@ span.listelement span.actions span:hover {
 }
 
 span.listelement span.actions span.reset {
-  background-position: -1px 0;
+  background-position: -1px -1px;
   border-left: 1px solid #e0e0e0;
 }
 
 span.listelement span.actions span.add {
-  background-position: -43px 0;
+  background-position: -43px -2px;
 }
 
 span.listelement span.actions span.search {
-  background-position: -65px 0;
+  background-position: -65px -1px;
   cursor: default;
 }
 





More information about the commits mailing list