Author: simoneg
Date: Fri Dec 11 17:11:55 2009
New Revision: 889706

URL: http://svn.apache.org/viewvc?rev=889706&view=rev
Log:
LABS-502 : graceful display of filter fields

Modified:
    
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js

Modified: 
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js?rev=889706&r1=889705&r2=889706&view=diff
==============================================================================
--- 
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
 (original)
+++ 
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
 Fri Dec 11 17:11:55 2009
@@ -18,7 +18,7 @@
 DynaForm_hideall = function() {
        var head = document.getElementsByTagName('head')[0],
            style = document.createElement('style'),
-           rules = document.createTextNode('h1 { background: red; }');
+           rules = document.createTextNode('.MagmaDynaBlock { display: none; } 
');
        
        style.type = 'text/css';
        if(style.styleSheet)
@@ -30,11 +30,6 @@
 DynaForm_hideall();
 
 addOnload(function() {
-       $('.MagmaDynaBlock').each(function() {
-               if ($('.NotNullable', this).length == 0) {
-                       $(this).toggle(false);
-               }
-       });
        $('.MagmaDynaForm').each(function() {
                var form = this;
                var rc = 0;
@@ -45,7 +40,8 @@
                        var labdiv = $('.MagmaLabel',this).get(0);
                        var flddiv = $('.MagmaField',this).get(0);
                        var field = $('input,select,textarea', flddiv).get(0);
-                       if (field && $('.NotNullable', this).length == 0) {
+                       var nn = $('.NotNullable', this).length == 0;
+                       if (field && nn) {
                                $(this).addClass('activeBlock');
                                $(this).addClass('block_' + rc);
                                form.df_labels[rc] = ($('label',labdiv).text());
@@ -53,18 +49,21 @@
                                if (field.type != 'checkbox') {
                                        if ($(field).val()) {
                                                DynaForm_set(form, rc);
+                                               this.style.display='block';
                                        } else {
                                                form.df_set[rc] = false;
                                        }
                                } else {
                                        if (field.checked) {
                                                DynaForm_set(form, rc);
+                                               this.style.display='block';
                                        } else {
                                                form.df_set[rc] = false;
                                        }
                                }
                                rc++;
                        }
+                       if (!nn) this.style.display='block';
                });
                $(this).append($('<div 
class="MagmaDynaSelection"><select/></div>'));
                DynaForm_resetSelection(this);



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to