elclanrs 10 years ago
parent
commit
7e0a6e2789

+ 2 - 1
js/extensions/custom-inputs/custom-inputs.ext.js

@@ -20,7 +20,8 @@ module.exports = {
       this._buildCustomInputs();
     },
 
-    addFields: function() {
+    // @extend
+    'addFields:after': function() {
       this._buildCustomInputs();
     },
 

+ 3 - 1
js/extensions/dynamic-fields/dynamic-fields.ext.js

@@ -78,7 +78,7 @@ module.exports = {
           field: template(self.opts.templates[field.type], field)
         });
 
-        self._inject('addFields', field);
+        self._inject('addFields:before', field);
 
         if (field.after || field.before) {
           self.$form.find('[name="'+ (field.after || field.before) +'"]').first().each(function() {
@@ -95,6 +95,8 @@ module.exports = {
           rules[name] = field.rules;
           self.addRules(rules);
         }
+
+        self._inject('addFields:after', field);
       });
 
     },

+ 32 - 32
js/extensions/steps/steps.ext.js

@@ -62,6 +62,38 @@ module.exports = {
       setTimeout(function(){ $(firstInvalid).focus() }, this.opts.steps.fadeSpeed);
     },
 
+    // @extend
+    addRules: function() {
+      this.firstStep();
+    },
+
+    // @extend
+    'addFields:before': function(field) {
+
+      if (field.after || field.before) return;
+
+      var $steps = this.$stepsContainer.find(this.opts.steps.step);
+
+      if (! ('appendToStep' in field)) {
+        field.appendToStep = $steps.length-1;
+      }
+
+      field.after = $steps
+        .eq(field.appendToStep)
+        .find('input, select, textarea')
+        .last()[0].name;
+    },
+
+    // @extend
+    toggleFields: function() {
+      this._updateSteps();
+    },
+
+    // @extend
+    removeFields: function() {
+      this._updateSteps();
+    },
+
     _buildSteps: function() {
 
       var self = this, options
@@ -97,38 +129,6 @@ module.exports = {
       });
     },
 
-    // @extend
-    addRules: function() {
-      this.firstStep();
-    },
-
-    // @extend
-    addFields: function(field) {
-
-      if (field.after || field.before) return;
-
-      var $steps = this.$stepsContainer.find(this.opts.steps.step);
-
-      if (! ('appendToStep' in field)) {
-        field.appendToStep = $steps.length-1;
-      }
-
-      field.after = $steps
-        .eq(field.appendToStep)
-        .find('input, select, textarea')
-        .last()[0].name;
-    },
-
-    // @extend
-    toggleFields: function() {
-      this._updateSteps();
-    },
-
-    // @extend
-    removeFields: function() {
-      this._updateSteps();
-    },
-
     goToStep: function(idx) {
       this.$stepsContainer.idealsteps('go', idx);
     },

File diff suppressed because it is too large
+ 38 - 35
js/out/jquery.idealforms.js


File diff suppressed because it is too large
+ 0 - 0
js/out/jquery.idealforms.min.js


+ 1 - 1
js/plugin.js

@@ -58,7 +58,7 @@ module.exports = (function() {
             return;
           }
 
-          if (Plugin.prototype[method]) {
+;         if (Plugin.prototype[method.split(':')[0]]) {
             Plugin._extended[method] = Plugin._extended[method] || [];
             Plugin._extended[method].push({ name: extension.name, fn: fn });
           } else {

Some files were not shown because too many files changed in this diff