Changeset 839285

Timestamp:

01/15/2014 09:32:22 PM (12 years ago)

Author:

jazzigor

Message:

Update trunk to v1.1

Location:

jazzy-forms/trunk

Files:

• back/elements.js (modified) (1 diff)
• back/gui.js (modified) (7 diffs)
• back/smartid.js (modified) (1 diff)
• core/Parser.php (modified) (4 diffs)
• core/Tokenizer.php (modified) (1 diff)
• front/jazzy-forms.js (modified) (2 diffs)
• jazzy-forms.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)

jazzy-forms/trunk/back/elements.js

@@ -102 +102 @@
         element.delegate('.jzzf_option_delete', 'click', self.delete_option);
         var smartid_element = element.find('.jzzf_element_name, .jzzf_element_title');
-        smartid_element.bind('blur', 'change', name_update_listener);
+        smartid_element.bind('blur', null, name_update_listener);
         var smartid = new jzzf_smartid(id_helper, element);
         smartid.bind();

jazzy-forms/trunk/back/gui.js

@@ -21 +21 @@
         var obj = {
             'title': title,
-            'name': name,
+            'name': '',
             'type': type,
             'decimals': 9,
@@ -40 +40 @@
         var gui = jzzf_element.create(type, element_id_helper, adjust_email_tab, update_element_names);
         gui.add(obj, remove ? item : null, false);
+        update_element_names();
         adjust_email_tab();
     }
@@ -106 +107 @@
             var name = id_helper.suggest_name(title);
             data.title = title;
-            data.name = name;
+            data.name = '';//name;
             jzzf_element.reset_ids(data);
             element.add(data, placeholder, false);
@@ -147 +148 @@
         
         $('#jzzf_new_form_title').bind('change keyup', function() {
-            $('#jzzf_title').val($('#jzzf_new_form_title').val()).change();
-            return true;
+            $('#jzzf_title').val($('#jzzf_new_form_title').val());
+            $('#jzzf_title').trigger('jzzf_smartid_change');
+            return false;
         });
         $('#jzzf_title').bind('change keyup', function() {
             $('#jzzf_new_form_title').val($('#jzzf_title').val());
-            return true;
+            return false;
         });
 
@@ -265 +267 @@
     }
     
+    function default_email_parameters() {
+        return {
+            'sending': 'Sending...',
+            'ok': "Message sent",
+            'fail': "Can't send the message"
+        };
+    }
+    
     function add_form() {
         switch_head(true);
@@ -277 +287 @@
             'theme': 1,
             'realtime': true,
-            'email': {
-                'sending': 'Sending...',
-                'ok': "Message sent",
-                'fail': "Can't send the message"
-            }
+            'email': default_email_parameters()
         };
         elements = [];
@@ -299 +305 @@
         form = jzzf_forms[idx];
         form_index = idx;
+        if(!form.email) {
+            form.email = default_email_parameters();
+        }
         set_form(form);
     }

jazzy-forms/trunk/back/smartid.js

@@ -35 +35 @@
     this.bind = function() {
         container.find('.jzzf_smartid').bind('change keyup', handle_id_change);
-        container.find('.jzzf_smartid_source').bind("keyup change", handle_source_change);
+        container.find('.jzzf_smartid_source').bind("keyup change jzzf_smartid_change", handle_source_change);
         container.find('.jzzf_smartid, .jzzf_smartid_source').bind("focus", handle_focus);
     }

jazzy-forms/trunk/core/Parser.php

@@ -7 +7 @@
 concatenation = sum, [ "&", concatenation ];
 sum = product, [("+" | "-"), sum];
-product = exponentiation, [("*" | "/"), term];
+product = exponentiation, [("*" | "/"), product];
 exponentiation = negation, ["^", exponentiation];
-negation = ["-"], term
-term = negation | number | string | function | identifier | association;
+negation = ["-"], percentage
+percentage = term ["%"]
+term = number | string | function | identifier | association;
 
 arguments = comparison, { ",", comparison };
@@ -171 +172 @@
                 return $num;
             } else {
-                $positive = $this->term();
+                $positive = $this->percentage();
                     if(!$positive) {
                     throw new Exception('missing negation operand');
@@ -179 +180 @@
             }
         } else {
-            return $this->term();
-        }
+            return $this->percentage();
+        }
+    }
+
+    private function percentage() {
+        $value = $this->term();
+        if($this->ahead('%')) {
+            if(!$value) {
+                throw new Exception("Unexpected percentage sign");
+            }
+            $this->consume();
+            if($value[0] == 'n') {
+                $value[1] /= 100;
+                return $value;
+            } else {
+                return array("o", "/", $value, array("n", 100));
+            }
+        }
+        return $value;
     }
         
     private function term() {
+        //$this->dump();
         if($this->complete()) {
             return array();
@@ -201 +220 @@
         return null;
     }
+    
+    // for debugging only
+    private function dump() {
+        print json_encode($this->rest) . "\n";
+    }
 }

jazzy-forms/trunk/core/Tokenizer.php

@@ -35 +35 @@
             
     private function operator() {
-        return $this->match('<=|>=|<>|[\-\+\*\/\^\,<>=&]');
+        return $this->match('<=|>=|<>|[\-\+\*\/\^\,<>=&%]');
     }
 

jazzy-forms/trunk/front/jazzy-forms.js

@@ -330 +330 @@
             case "r":
                 return element(id).find('input:checked').siblings("label").text();
+            case "c":
+                var box = element(id);
+                return box.is(':checked') ? box.siblings("label").text() : "";
             default:
                 types.raise_ref();
         }
+    }
+    
+    this.selected = function(id) {
+        var type = graph.types[id];
+        switch(type) {
+            case "d":
+                return element(id).find('option:selected').index() + 1;
+            case "r":
+                return element(id).find('input:checked').parent().index() + 1;
+            case "c":
+                return types.value(element(id).is(':checked')) ? 1 : 0;
+            default:
+                types.raise_ref();
+        }
+    }
+    
+    this.checked = function(id) {
+        if(graph.types[id] != 'c') {
+            types.raise_ref();
+        }
+        return element(id).is(':checked');
     }
     
@@ -522 +546 @@
             var id = _id(args);
             return engine.label(id);
-        }
-        
+        },
+        'selected': function(args) {
+            var id = _id(args);
+            return engine.selected(id);
+        },
+        'checked': function(args) {
+            var id = _id(args);
+            return engine.checked(id);
+        }
     };
     

jazzy-forms/trunk/jazzy-forms.php

@@ -4 +4 @@
 Plugin URI: http://www.jazzyforms.com/
 Description: Online form builder with an emphasis on calculation
-Version: 1.0
+Version: 1.1
 Author: Igor Prochazka
 Author URI: http://www.jazzyforms.com/
@@ -10 +10 @@
 ---------------------------------------------------------------------
     This file is part of the WordPress plugin "Jazzy Forms"
-    Copyright (C) 2012, 2013 by Igor Prochazka
+    Copyright (C) 2012-2014 by Igor Prochazka
 
     This program is free software: you can redistribute it and/or modify
@@ -28 +28 @@
 */
 
-define(JZZF_VERSION, 1.0000);
-define(JZZF_VERSION_STRING, "1.0000");
+define(JZZF_VERSION, 1.0100);
+define(JZZF_VERSION_STRING, "1.0100");
 define(JZZF_OPTION_VERSION, 'jzzf_version');
 

jazzy-forms/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.2.1
 Tested up to: 3.8
-Stable tag: 1.0
+Stable tag: 1.1 
 
 Online form builder, ideal for cost-estimates and calculations
@@ -36 +36 @@
 * Text/Heading/HTML
 
-Features like input validation, anti-spam measures or data collection are coming soon.
-
 [Official web site](http://www.jazzyforms.com/?utm_source=wordpress&utm_medium=plugin_directory&utm_term=&utm_content=&utm_campaign=official)
 
@@ -120 +118 @@
 
 == Changelog ==
+
+= 1.1 =
+* Support for percentage notation
+* Extend LABEL function to checkboxes
+* SELECTED and CHECKED functions
+* Several backend fixes
 
 = 1.0 =