fix for DubFriend#25 firstItemUndeletable fail on nested

mrreddevil2412 · Oct 8, 2016 · 9259896 · 9259896
1 parent 45b8390
commit 9259896
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 56 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -75,4 +75,4 @@ module.exports = function (grunt) {
 
     grunt.registerTask('default', ['preprocess', 'concat', 'uglify', 'qunit']);
     grunt.registerTask('test', ['preprocess', 'concat', 'uglify', 'qunit']);
-};
+};
diff --git a/index.html b/index.html
@@ -75,22 +75,22 @@ <h2>Repeater</h2>
 
     <h2>Nested</h2>
     <form action="echo.php" class="outer-repeater">
-      <div data-repeater-list="outer-group">
-        <div data-repeater-item>
-          <input type="text" name="text-input" value="A"/>
-          <input data-repeater-delete type="button" value="Delete"/>
+      <div data-repeater-list="outer-group" class="outer">
+        <div data-repeater-item class="outer">
+          <input type="text" name="text-input" value="A" class="outer"/>
+          <input data-repeater-delete type="button" value="Delete" class="outer"/>
           <div class="inner-repeater">
-            <div data-repeater-list="inner-group">
-              <div data-repeater-item>
-                <input type="text" name="inner-text-input" value="B"/>
-                <input data-repeater-delete type="button" value="Delete"/>
+            <div data-repeater-list="inner-group" class="inner">
+              <div data-repeater-item class="inner">
+                <input type="text" name="inner-text-input" value="B" class="inner"/>
+                <input data-repeater-delete type="button" value="Delete" class="inner"/>
               </div>
             </div>
-            <input data-repeater-create type="button" value="Add"/>
+            <input data-repeater-create type="button" value="Add" class="inner"/>
           </div>
         </div>
       </div>
-      <input data-repeater-create type="button" value="Add"/>
+      <input data-repeater-create type="button" value="Add" class="outer"/>
     </form>
 
     <script src="jquery-1.11.1.js"></script>
@@ -121,6 +121,7 @@ <h2>Nested</h2>
         });
 
         $('.outer-repeater').repeater({
+            isFirstItemUndeletable: true,
             defaultValues: { 'text-input': 'outer-default' },
             show: function () {
                 console.log('outer show');
@@ -131,6 +132,7 @@ <h2>Nested</h2>
                 $(this).slideUp(deleteElement);
             },
             repeaters: [{
+                isFirstItemUndeletable: true,
                 selector: '.inner-repeater',
                 defaultValues: { 'inner-text-input': 'inner-default' },
                 show: function () {

diff --git a/index.pre.html b/index.pre.html
@@ -44,6 +44,7 @@ <h2>Nested</h2>
         });
 
         $('.outer-repeater').repeater({
+            isFirstItemUndeletable: true,
             defaultValues: { 'text-input': 'outer-default' },
             show: function () {
                 console.log('outer show');
@@ -54,6 +55,7 @@ <h2>Nested</h2>
                 $(this).slideUp(deleteElement);
             },
             repeaters: [{
+                isFirstItemUndeletable: true,
                 selector: '.inner-repeater',
                 defaultValues: { 'inner-text-input': 'inner-default' },
                 show: function () {

diff --git a/jquery.repeater.js b/jquery.repeater.js
@@ -1,6 +1,6 @@
-// jquery.repeater version 1.1.5
+// jquery.repeater version 1.2.0
 // https://github.com/DubFriend/jquery.repeater
-// (MIT) 03-10-2016
+// (MIT) 08-10-2016
 // Brian Detering <[email protected]> (http://www.briandetering.net/)
 (function ($) {
 'use strict';
@@ -827,12 +827,11 @@ $.fn.repeater = function (fig) {
         var $itemTemplate = $list.find('[data-repeater-item]')
                                  .first().clone().hide();
 
-        // if(fig.initEmpty) {
-        //     $itemTemplate.css('display', '');
-        // }
-
-        var $firstDeleteButton = $(this).find('[data-repeater-item]').first()
-                                        .find('[data-repeater-delete]');
+        var $firstDeleteButton = $filterNested(
+            $filterNested($(this).find('[data-repeater-item]'), fig.repeaters)
+            .first().find('[data-repeater-delete]'),
+            fig.repeaters
+        );
 
         if(fig.isFirstItemUndeletable && $firstDeleteButton) {
             $firstDeleteButton.remove();

diff --git a/jquery.repeater.min.js b/jquery.repeater.min.js
diff --git a/nested-repeater.html b/nested-repeater.html
@@ -1,18 +1,18 @@
 <form action="echo.php" class="outer-repeater">
-  <div data-repeater-list="outer-group">
-    <div data-repeater-item>
-      <input type="text" name="text-input" value="A"/>
-      <input data-repeater-delete type="button" value="Delete"/>
+  <div data-repeater-list="outer-group" class="outer">
+    <div data-repeater-item class="outer">
+      <input type="text" name="text-input" value="A" class="outer"/>
+      <input data-repeater-delete type="button" value="Delete" class="outer"/>
       <div class="inner-repeater">
-        <div data-repeater-list="inner-group">
-          <div data-repeater-item>
-            <input type="text" name="inner-text-input" value="B"/>
-            <input data-repeater-delete type="button" value="Delete"/>
+        <div data-repeater-list="inner-group" class="inner">
+          <div data-repeater-item class="inner">
+            <input type="text" name="inner-text-input" value="B" class="inner"/>
+            <input data-repeater-delete type="button" value="Delete" class="inner"/>
           </div>
         </div>
-        <input data-repeater-create type="button" value="Add"/>
+        <input data-repeater-create type="button" value="Add" class="inner"/>
       </div>
     </div>
   </div>
-  <input data-repeater-create type="button" value="Add"/>
+  <input data-repeater-create type="button" value="Add" class="outer"/>
 </form>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery.repeater",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "repeatable form input interface",
   "main": "jquery.repeater.js",
   "directories": {
@@ -26,11 +26,11 @@
   },
   "homepage": "https://github.com/DubFriend/jquery.repeater",
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-qunit": "^0.5.2",
-    "grunt-contrib-uglify": "^0.5.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-preprocess": "^4.0.0"
+    "grunt": "^1.0.1",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-qunit": "^1.2.0",
+    "grunt-contrib-uglify": "^2.0.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-preprocess": "^5.1.0"
   }
 }
diff --git a/repeater.jquery.json b/repeater.jquery.json
@@ -1,6 +1,6 @@
 {
     "name": "repeater",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "title": "Repeater",
     "author": {
         "name": "Brian Detering",

diff --git a/src/repeater.js b/src/repeater.js
@@ -102,12 +102,11 @@ $.fn.repeater = function (fig) {
         var $itemTemplate = $list.find('[data-repeater-item]')
                                  .first().clone().hide();
 
-        // if(fig.initEmpty) {
-        //     $itemTemplate.css('display', '');
-        // }
-
-        var $firstDeleteButton = $(this).find('[data-repeater-item]').first()
-                                        .find('[data-repeater-delete]');
+        var $firstDeleteButton = $filterNested(
+            $filterNested($(this).find('[data-repeater-item]'), fig.repeaters)
+            .first().find('[data-repeater-delete]'),
+            fig.repeaters
+        );
 
         if(fig.isFirstItemUndeletable && $firstDeleteButton) {
             $firstDeleteButton.remove();

diff --git a/test/index.html b/test/index.html
@@ -71,22 +71,22 @@
     </form>
 
     <form action="echo.php" class="outer-repeater">
-      <div data-repeater-list="outer-group">
-        <div data-repeater-item>
-          <input type="text" name="text-input" value="A"/>
-          <input data-repeater-delete type="button" value="Delete"/>
+      <div data-repeater-list="outer-group" class="outer">
+        <div data-repeater-item class="outer">
+          <input type="text" name="text-input" value="A" class="outer"/>
+          <input data-repeater-delete type="button" value="Delete" class="outer"/>
           <div class="inner-repeater">
-            <div data-repeater-list="inner-group">
-              <div data-repeater-item>
-                <input type="text" name="inner-text-input" value="B"/>
-                <input data-repeater-delete type="button" value="Delete"/>
+            <div data-repeater-list="inner-group" class="inner">
+              <div data-repeater-item class="inner">
+                <input type="text" name="inner-text-input" value="B" class="inner"/>
+                <input data-repeater-delete type="button" value="Delete" class="inner"/>
               </div>
             </div>
-            <input data-repeater-create type="button" value="Add"/>
+            <input data-repeater-create type="button" value="Add" class="inner"/>
           </div>
         </div>
       </div>
-      <input data-repeater-create type="button" value="Add"/>
+      <input data-repeater-create type="button" value="Add" class="outer"/>
     </form>
 
     <div class="complex-repeater">

diff --git a/test/nested.js b/test/nested.js
@@ -10,6 +10,70 @@ QUnit.module('nested-repeater', {
 });
 
 
+QUnit.test('isFirstItemUndeletable configuration option', function (assert) {
+    this.$outerRepeater.repeater({
+        isFirstItemUndeletable: true,
+        repeaters: [{
+            selector: '.inner-repeater',
+            isFirstItemUndeletable: true
+        }]
+    });
+
+    this.$outerAddButton.click();
+    this.$innerAddButton.click();
+
+    var $outerItems = this.$outerRepeater.find('[data-repeater-list="outer-group"] > [data-repeater-item]');
+    var $innerItems = this.$innerRepeater.find('[data-repeater-item]');
+
+    assert.strictEqual($outerItems.length, 2, 'adds a second item to outer list');
+    assert.strictEqual($innerItems.length, 2, 'adds a second item to inner list');
+    assert.strictEqual(
+        // this.$outerRepeater.find('[data-repeater-list="outer-group"] > [data-repeater-item]')
+        // .first().find('[data-repeater-delete]').length,
+        // this.$outerRepeater.find(
+        //     '[data-repeater-list="outer-group"] > [data-repeater-item] > [data-repeater-delete]'
+        // ).first().length,
+        this.$outerRepeater.find('[data-repeater-item].outer')
+        .first().find('[data-repeater-delete].outer').length,
+        0,
+        'No delete button on first outer item'
+    );
+
+    assert.strictEqual(
+        this.$outerRepeater.find('[data-repeater-item].outer')
+        .last().find('[data-repeater-delete].outer').length,
+        1,
+        'Delete button on second outer item'
+    );
+
+    assert.strictEqual(
+        this.$innerRepeater.find('[data-repeater-item]')
+        .first().find('[data-repeater-delete]').length,
+        0,
+        'No delete button on first inner item of first outer item'
+    );
+
+    assert.strictEqual(
+        this.$innerRepeater.find('[data-repeater-item]')
+        .last().find('[data-repeater-delete]').length,
+        1,
+        'Delete button on second inner item of first outer item'
+    );
+
+    assert.strictEqual(
+        this.$outerRepeater.find('[data-repeater-list="inner-group"]').last()
+        .find('[data-repeater-item]').first().find('[data-repeater-delete]').length,
+        0,
+        'No delete button on first inner item of second outer item'
+    );
+
+    // var $firstDeleteButton = this.$repeater.find('[data-repeater-item]')
+    //                                     .first().find('[data-repeater-delete]');
+
+
+    // assert.strictEqual($firstDeleteButton.length, 0, 'first delete button is removed');
+});
+
 QUnit.test('add item nested outer', function (assert) {
     this.$outerRepeater.repeater({ repeaters: [{ selector: '.inner-repeater' }] });
     this.$outerAddButton.click();
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,4 +75,4 @@ module.exports = function (grunt) { @@
         grunt.registerTask('default', ['preprocess', 'concat', 'uglify', 'qunit']);
         grunt.registerTask('test', ['preprocess', 'concat', 'uglify', 'qunit']);
-    };
+    };