switched to native ember component to fix status bug

mgenev · Mar 23, 2015 · 09fc17c · 09fc17c
1 parent a91fb1f
commit 09fc17c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/client/app/pods/components/status-activity/template.hbs b/client/app/pods/components/status-activity/template.hbs
@@ -1,5 +1,5 @@
 {{yield}}
 <div class="form-group">
     <label for="status-activity">What are you doing?</label>
-    {{input type="text" id="status-activity" value=model.activity class="form-control"}}
-</div>
+    {{input type="text" id="status-activity" value=status.activity class="form-control"}}
+</div>
diff --git a/client/app/pods/components/status-note/template.hbs b/client/app/pods/components/status-note/template.hbs
@@ -1,6 +1,5 @@
 {{yield}}
 <div class="form-group">
     <label for="status-note">What is on your mind?</label>
-    {{input type="text" id="status-note" value=model.note class="form-control" autofocus="autofocus"}}
+    {{input type="text" id="status-note" value=status.note class="form-control" autofocus="autofocus"}}
 </div>
-
diff --git a/client/app/pods/components/status-state-picker/component.js b/client/app/pods/components/status-state-picker/component.js
@@ -5,15 +5,15 @@ export default Ember.Component.extend( FocusForKeypress, {
 	action: 'submitAction',
 	keyDown: function (e) {
         if (e.keyCode === 13) {
-            this.sendAction('action', this.get('model'));
+            this.sendAction('action', this.get('status'));
         }
     },
 	actions: {
 		pickState: function (state) {
-			this.model.set('state', state);
+			this.status.set('state', state);
 		}
 	},
-	removeOutline: function() { 
+	removeOutline: function() {
         this.$().css('outline-style', 'none');
     }.on('didInsertElement')
 });
diff --git a/client/app/pods/components/wizard-form/component.js b/client/app/pods/components/wizard-form/component.js
@@ -19,7 +19,7 @@ export default Ember.Component.extend({
 
         submitAction: function() {
             if (this.get('lastStep')) {
-                this.sendAction('action', this.get('model'));
+                this.sendAction('action', this.get('status'));
             } else {
                 this.triggerAction({
                     action: 'nextStep',

diff --git a/client/app/pods/components/wizard-form/template.hbs b/client/app/pods/components/wizard-form/template.hbs
@@ -4,18 +4,18 @@
 	{{/each}}
 </ol>
 
-<form role="form" {{action 'submitAction' model on='submit'}}>   
-	{{dynamic-component type=type model=model}}
+<form role="form" {{action 'submitAction' status on='submit'}}>
+
+	{{component type status=status}}
 
 	{{#unless lastStep}}
 		<div {{action 'nextStep'}} class="btn btn-info">Next</div>
 	{{else}}
-		<button {{action 'submitAction' model}} type="submit" class="btn btn-default">Submit</button>
+		<button {{action 'submitAction' status}} type="submit" class="btn btn-default">Submit</button>
 	{{/unless}}
 
 	<div class="bump"></div>
 
 </form>
 
 {{yield}}
-
diff --git a/client/app/pods/s/feed/status/template.hbs b/client/app/pods/s/feed/status/template.hbs
@@ -4,5 +4,5 @@
     <div class="page-header">
         <h2>Status</h2>
     </div>
-    {{wizard-form action="postStatus" steps=steps model=model}}    
+    {{wizard-form action="postStatus" steps=steps status=model}}
 </div>