push_type_admin 0.5.0.alpha.1 → 0.5.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cc13203e49f92317bb5f7d66a44b442e77b046
-  data.tar.gz: 73a58e4c00ae2272d4553f92873f65eee1cbdb3c
+  metadata.gz: 2c8094baec79b85103933fcabc0200dd4111d012
+  data.tar.gz: e668ee21f59fe08c11fbf1a41de304f05aedd0d3
 SHA512:
-  metadata.gz: 672984c2e948223e360ffda43c619627e4d61ae8e665937a3b43409a8ef7367aec86aec458c93a71832373453a3bd4e835675c129b4a918d57b7feddf78514f0
-  data.tar.gz: 189c06b0e04d7604e0e9e6c5200d4d9ffb27a39deb358bfbdd641177e303ffc182ce4079c76e96b8ae961751214de244be78abcabd2099da062a69acd91e7687
+  metadata.gz: 4b91b21b1050c988fd13551ba66941cac2dd1fee628f339072ee9ff4d18a96d700d8cde8d2f10043f39425760246e07b7725346ae68eca1013207f06ca6460a8
+  data.tar.gz: 6b3fd75c4f019634191ac9045538af674f1c08c759430a767ca74e7cd23144351da8c07fbf3aa01569e035cb787bce5b25bd1ae38f532e1dfdfc61898213e0b4

data/app/assets/javascripts/push_type/matrix_field.js.coffee

@@ -0,0 +1,15 @@
+@app.controller 'MatrixFieldCtrl',  ['$scope', ($scope) ->
+
+  $scope.rows = [{}]
+
+  $scope.initRows = (rows) ->
+    $scope.rows = rows if rows?
+
+  $scope.addRow = ->
+    $scope.rows.push {}
+
+  $scope.removeRow = (i) ->
+    console.log "Removeing #{i}" 
+    $scope.rows.splice(i, 1);
+
+]

data/app/assets/javascripts/push_type/repeater_field.js.coffee

@@ -1,14 +1,15 @@
 @app.controller 'RepeaterFieldCtrl',  ['$scope', ($scope) ->
 
-  $scope.rows = [$scope.obj]
+  $scope.rows = [null]
 
   $scope.initRows = (rows) ->
-    $scope.rows = rows if rows? && rows.length
+    $scope.rows = rows if rows?
 
   $scope.addRow = ->
-    $scope.rows.push $scope.obj
+    $scope.rows.push null
 
   $scope.removeRow = (i) ->
+    console.log "Removeing #{i}" 
     $scope.rows.splice(i, 1);
 
 ]

data/app/views/push_type/fields/_matrix.html.haml

@@ -1,6 +1,6 @@
 = f.label field.name, field.label
 
-.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "obj={}; initRows(#{ f.object.send(field.name).to_json })" } }
+.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ f.object.send(field.name).to_json })" } }
   %table
     %thead
       %tr

data/app/views/push_type/fields/_repeater.html.haml

@@ -1,10 +1,11 @@
 = f.label field.name, field.label
 
-.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "obj=null; initRows(#{ f.object.send(field.name).to_json })" } }
+.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ f.object.send(field.name).to_json })" } }
   %table
-    %tr{ ng: { repeat: 'row in rows track by $index' } }
-      %td= f.send field.form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.name }][]", id: "#{ f.object_name }_#{ field.name }_{{ $index }}", value: nil, :'ng-model' => 'row')
-      %td.remove
-        %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
+    %tbody
+      %tr{ ng: { repeat: 'row in rows track by $index' } }
+        %td= f.send field.form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.name }][]", id: "#{ f.object_name }_#{ field.name }_{{ $index }}", value: nil, :'ng-model' => 'rows[$index]')
+        %td.remove
+          %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
   .plus
     %a.button.success.tiny.radius{ ng: { click: 'addRow()' } }= ficon :plus, 'Add row'