gina 0.1.6-alpha.135 → 0.1.6-alpha.137

package/framework/v0.1.6-alpha.137/VERSION

@@ -0,0 +1 @@
+0.1.6-alpha.137

package/framework/{v0.1.6-alpha.135 → v0.1.6-alpha.137}/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.135/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.137/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/{v0.1.6-alpha.135 → v0.1.6-alpha.137}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -3079,6 +3079,11 @@ function handleXhr(xhr, $el, options, require) {
         // In case the user is also redirecting
         var redirectDelay = (/Google Inc/i.test(navigator.vendor)) ? 50 : 0;
 
+        // Data loading ...
+        // if (xhr.readyState == 3) {
+        //     $form.target.setAttribute('data-gina-form-loading', true);
+        // }
+
         if (xhr.readyState == 2) { // responseType interception
             isAttachment    = ( /^attachment\;/.test( xhr.getResponseHeader('Content-Disposition') ) ) ? true : false;
             // force blob response type
@@ -10915,7 +10920,7 @@ function ValidatorPlugin(rules, data, formId) {
                 , value         = null // current value
                 , defaultValue  = null
             ;
-
+            $form.isBeingReseted = true;
             for (var f in $form.fieldsSet) {
 
                 $element    = document.getElementById(f);
@@ -10952,6 +10957,7 @@ function ValidatorPlugin(rules, data, formId) {
                 }
 
             }
+            delete $form.isBeingReseted;
         }
 
         return $form
@@ -10993,6 +10999,7 @@ function ValidatorPlugin(rules, data, formId) {
 
         var $target = this.target , id = $target.getAttribute('id');
         var $form   = instance.$forms[id] || this;
+        var $submitTrigger = document.getElementById($form.submitTrigger) || null;
         var result  = null;
         var XHRData = null;
         var isAttachment = null; // handle download
@@ -11123,6 +11130,13 @@ function ValidatorPlugin(rules, data, formId) {
 
         if (xhr) {
             // catching ready state cb
+            // Data loading ...
+            if ( /^(1|3)$/.test(xhr.readyState) ) {
+                $form.target.setAttribute('data-gina-form-loading', true);
+                if ($submitTrigger) {
+                    $submitTrigger.setAttribute('disabled', true)
+                }
+            }
             //handleXhrResponse(xhr, $target, id, $form, hFormIsRequired);
             xhr.onreadystatechange = function onValidationCallback(event) {
                 $form.isSubmitting = false;
@@ -11133,6 +11147,13 @@ function ValidatorPlugin(rules, data, formId) {
                 //     $form.sent = false;
                 // }, 1000); // 1000
 
+                // Data loading ...
+                if ( /^(1|3)$/.test(xhr.readyState) ) {
+                    $form.target.setAttribute('data-gina-form-loading', true);
+                    if ($submitTrigger) {
+                        $submitTrigger.setAttribute('disabled', true)
+                    }
+                }
                 // In case the user is also redirecting
                 var redirectDelay = (/Google Inc/i.test(navigator.vendor)) ? 50 : 0;
 
@@ -11146,6 +11167,13 @@ function ValidatorPlugin(rules, data, formId) {
                 }
 
                 if (xhr.readyState == 4) {
+
+                    $form.sent = false;
+                    if ($submitTrigger) {
+                        $submitTrigger.removeAttribute('disabled')
+                    }
+                    $form.target.removeAttribute('data-gina-form-loading');
+
                     var $popin          = null;
                     var blob            = null;
                     var contentType     = xhr.getResponseHeader("Content-Type");
@@ -11657,9 +11685,12 @@ function ValidatorPlugin(rules, data, formId) {
 
                 $form.eventData.ontimeout = result;
 
+                $form.target.setAttribute('data-gina-form-loading', false);
+
                 // intercept upload
-                if ( /^gina\-upload/i.test(id) )
+                if ( /^gina\-upload/i.test(id) ) {
                     onUpload(gina, $target, 'error', id, result);
+                }
 
                 triggerEvent(gina, $target, 'error.' + id, result);
 
@@ -13278,6 +13309,11 @@ function ValidatorPlugin(rules, data, formId) {
 
                         var processEvent = function() {
 
+                            // if ( typeof($form.isBeingReseted) != 'undefined' && /^true$/.test($form.isBeingReseted) ) {
+                            //     handleErrorsDisplay(event.target.form, {}, null, event.target.name);
+                            //     return cancelEvent(event);
+                            // }
+
                             if ( !/^(password)$/i.test(event.target.type) ) {
                                 console.debug('processing: ' + event.target.name+ '/'+ event.target.id);
                             }
@@ -14842,7 +14878,10 @@ function ValidatorPlugin(rules, data, formId) {
         var updateSelect = function($el, $form) {
             $el.setAttribute('data-value', $el.value);
             // If Live check enabled, proceed to silent validation
-            if ( /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0) ) {
+            if (
+                /^(true)$/i.test($form.target.dataset.ginaFormLiveCheckEnabled && $form.rules.count() > 0)
+                // && typeof($form.isBeingReseted) == 'undefined'
+            ) {
                 var localField = {}, $localField = {}, $localForm = null;
                 $localForm = $el.form;//event.target.form
                 localField[event.target.name]     = event.target.value;
@@ -15670,7 +15709,9 @@ function ValidatorPlugin(rules, data, formId) {
                             ||
                             isCustomSubmit && !/^submit\./i.test(_evt)
                         ) {
-                            _evt = 'submit.'+_evt
+                            _evt = 'submit.'+_evt;
+                            // Updating submitTrigger in case it has been changed on the fly
+                            instance.$forms[$form.id].submitTrigger = $form.submitTrigger = $el.id;
                         }
                         // in case we have multiple reset type buttons
                         if ( $el.type == 'reset' && !/^reset\./i.test(_evt) ) {
@@ -15762,10 +15803,11 @@ function ValidatorPlugin(rules, data, formId) {
                     , isDisabled    = null
                 ;
 
-                // stop there if form has already been sent
-                if (instance.$forms[id].sent) {
-                    return;
-                }
+
+                // stop there if form has already been sent - anti spam
+                // if (instance.$forms[id].sent) {
+                //     return;
+                // }
 
                 var validatorInfos = getFormValidationInfos($target, rules);
                 fields  = validatorInfos.fields;
@@ -15939,8 +15981,9 @@ function ValidatorPlugin(rules, data, formId) {
             }
 
             // prevent event to be triggered twice
-            if ( typeof(e.defaultPrevented) != 'undefined' && e.defaultPrevented )
+            if ( typeof(e.defaultPrevented) != 'undefined' && e.defaultPrevented ) {
                 return false;
+            }
 
             if (withRules || isBinded) {
                 cancelEvent(e);
@@ -16098,10 +16141,18 @@ function ValidatorPlugin(rules, data, formId) {
         }
         //if (!$formInstance) return;
 
-        if ( typeof($formInstance.submitTrigger) == 'undefined') {
+
+        if (
+            typeof($formInstance.submitTrigger) == 'undefined'
+            && /^(true)$/i.test($formInstance.target.dataset.ginaFormLiveCheckEnabled)
+        ) {
             console.warn('This might be normal, so do not worry if this form is handled by your javascript: `'+ $formInstance.id +'`\nGina could not complete `updateSubmitTriggerState()`: `submitTrigger` might not be attached to form instance `'+ $formInstance.id +'`\nTo disable this warning, You just need to disable `Form Live Checking on your form by adding to your <form>: `data-gina-form-live-check-enabled=false``')
         } else if ( document.getElementById($formInstance.submitTrigger) ) {
-            if ( /true/i.test(isFormValid) ) { // show submitTrigge
+            if (
+                /^true$/i.test(isFormValid)
+                ||
+                !/^(true)$/i.test($formInstance.target.dataset.ginaFormLiveCheckEnabled)
+            ) { // show submitTrigge
                 document.getElementById($formInstance.submitTrigger).disabled = false;
             } else { // hide submitTrigger
                 document.getElementById($formInstance.submitTrigger).disabled = true;
@@ -20342,7 +20393,7 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
 
             var attr    = 'data-gina-popin-name';
             var $els    = getElementsByAttribute(attr);
-            var $el     = null, name = null;
+            var $el     = null, name = null, id = null;
             var url     = null;
             var proceed = null, evt = null;
             var i = null, len = null;
@@ -20375,16 +20426,27 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                 }
 
                 if (name == $popin.name) {
+                    id = $el.id || $el.getAttribute('id') || null;
+                    // By default
                     evt = 'popin.click.'+ 'gina-popin-' + instance.id +'-'+ uuid.v4() +'-'+ name;
-                    $el['id'] = evt;
-                    $el.setAttribute( 'id', evt);
-                    // $el.setAttribute( 'data-dialog', evt);
+                    // console.debug("[POPIN CLICK #1]", id, " VS ", evt);
+                    // Retrieving existing event
+                    if ( id && new RegExp( '^popin.click.gina-popin-').test(id) ) {
+                    // if ( id && new RegExp( '^popin.click.gina-popin-' + instance.id).test(id) ) {
+                        // console.debug("[POPIN CLICK #2]", id, " VS ", evt);
+                        evt = id;
+                    }
 
                     if (!gina.events[evt]) {
+                        $el['id'] = evt;
+                        $el.setAttribute( 'id', evt);
+                        // $el.setAttribute( 'data-dialog', evt);
 
                         // attach click events
                         addListener(gina, $el, evt, function(e) {
                             cancelEvent(e);
+                            // console.debug("[POPIN CLICK #3]", $popin.openTrigger, " VS ", e.currentTarget.id);
+                            $popin.openTrigger = e.currentTarget.id || e.currentTarget.getAttribute('id');
 
                             var fired = false;
                             addListener(gina, $popin.target, 'loaded.'+$popin.id, function(e) {
@@ -20461,8 +20523,10 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                     //console.log('popin.click !! ', event.target);
                     var _evt = event.target.id;
 
-                    if ( new RegExp( '^popin.click.gina-popin-' + instance.id).test(_evt) )
+                    if ( new RegExp( '^popin.click.gina-popin-' + instance.id).test(_evt) ) {
                         triggerEvent(gina, event.target, _evt, event.detail);
+                    }
+
                 }
             });
 
@@ -20568,8 +20632,9 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                             cancelEvent(event);
                             var _evt = event.target.id;
 
-                            if ( new RegExp( '^popin.click.gina-popin-' + instance.id).test(_evt) )
+                            if ( new RegExp( '^popin.click.gina-popin-' + instance.id).test(_evt) ) {
                                 triggerEvent(gina, event.target, _evt, event.detail);
+                            }
 
                         }
                     }
@@ -21055,8 +21120,9 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                 this.name = name;
             }
             // popin object
-            var $popin      = getPopinByName(name);
-            var id          = $popin.id;
+            var $popin          = getPopinByName(name);
+            var id              = $popin.id;
+            var $popinTrigger   = document.getElementById($popin.openTrigger) || null;
 
             // set as active if none is active
             if ( !gina.popin.activePopinId ) {
@@ -21201,9 +21267,17 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
 
                 // catching ready state cb
                 xhr.onreadystatechange = function (event) {
+                    // Data loading ...
+                    if ( /^(3)$/.test(xhr.readyState) ) {
+                        $popin.target.setAttribute('data-gina-popin-loading', true);
+                        if ($popinTrigger) {
+                            $popinTrigger.setAttribute('disabled', true);
+                        }
+                    }
                     if (xhr.readyState == 4) {
                         // 200, 201, 201' etc ...
-                        var result = null
+                        var result = null;
+
                         if ( /^2/.test(xhr.status) ) {
                             try {
                                 result = xhr.responseText;
@@ -21729,7 +21803,7 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                 name    = this.name;
                 $popin  = this;
             } else {
-                $popin  = getPopinByName(name) || getActivePopin();
+                $popin  = getPopinByName(name) || getActivePopin();
                 if (!$popin)
                     return;
 
@@ -21753,6 +21827,7 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                     return;
 
                 $el = $popin.target;
+                var $popinTrigger = document.getElementById($popin.openTrigger) || null;
 
                 if ( typeof($el.close) === "function" ) {
                     $el.close();
@@ -21790,6 +21865,10 @@ define('gina/popin', [ 'require', 'vendor/uuid', 'jquery', 'lib/domain', 'lib/me
                         }
                         $popin.$headers = [];
                     }
+
+                    if ($popinTrigger) {
+                        $popinTrigger.removeAttribute('disabled');
+                    }
                     triggerEvent(gina, $popin.target, 'close.'+ $popin.id, $popin);
                 }
             }