Skip to content
Extraits de code Groupes Projets
Valider 3a47590d rédigé par Dennis Collinson's avatar Dennis Collinson
Parcourir les fichiers

DG DC OMG FORMZ

parent 9fbc4b74
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -43,6 +43,7 @@ javascripts:
- public/javascripts/app/helpers/*
- public/javascripts/app/router.js
- public/javascripts/app/views.js
- public/javascripts/app/forms.js
- public/javascripts/app/models/post.js
- public/javascripts/app/models/*
- public/javascripts/app/pages/*
......@@ -51,6 +52,7 @@ javascripts:
- public/javascripts/app/views/content_view.js
- public/javascripts/app/views/*.js
- public/javascripts/app/views/**/*.js
- public/javascripts/app/forms/*.js
- public/javascripts/diaspora.js
- public/javascripts/helpers/*.js
......
......@@ -4,6 +4,7 @@ var app = {
helpers: {},
views: {},
pages: {},
forms: {},
user: function(userAttrs) {
if(userAttrs) { return this._user = new app.models.User(userAttrs) }
......
app.views.PostForm = app.views.Base.extend({
templateName : "post-form",
app.forms.Base = app.views.Base.extend({
events :{
'submit form' : 'setModelAttributes'
},
// subviews : {
// ".aspect_form" : "aspectDropdown"
// },
formAttrs : {
".text" : "text"
},
// initialize : function(){
//// this.aspectsDropdown = new app.views.AspectDropdown()
// },
setModelAttributes : function(evt){
if(evt){ evt.preventDefault(); }
......@@ -30,4 +16,4 @@ app.views.PostForm = app.views.Base.extend({
this.model.set(_.inject(this.formAttrs, setValueFromField, {}))
this.model.trigger("setFromForm")
}
});
\ No newline at end of file
})
app.forms.Post = app.forms.Base.extend({
templateName : "post-form",
subviews : {
".aspect_selector" : "aspectsDropdown"
},
formAttrs : {
".text" : "text",
// ".aspect_ids" : "aspect_ids"
},
initialize : function(){
this.aspectsDropdown = new app.views.AspectsDropdown()
}
});
\ No newline at end of file
......@@ -5,7 +5,7 @@ app.pages.PostNew = app.views.Base.extend({
initialize : function(){
this.model = new app.models.StatusMessage()
this.postForm = new app.views.PostForm({model : this.model})
this.postForm = new app.forms.Post({model : this.model})
this.model.bind("setFromForm", this.saveModel, this)
},
......
......@@ -9,7 +9,10 @@ app.views.Base = Backbone.View.extend({
},
setupRenderEvents : function(){
this.model.bind('remove', this.remove, this);
if(this.model) {
//this should be in streamobjects view
this.model.bind('remove', this.remove, this);
}
// this line is too generic. we usually only want to re-render on
// feedback changes as the post content, author, and time do not change.
......
app.views.AspectsDropdown = app.views.Base.extend({
templateName : "aspects-dropdown"
})
\ No newline at end of file
describe("app.views.PostForm", function(){
describe("app.forms.Post", function(){
beforeEach(function(){
this.post = new app.models.Post();
this.view = new app.views.PostForm({model : this.post})
this.view = new app.forms.Post({model : this.post})
})
describe("rendering", function(){
......
......@@ -46,6 +46,7 @@ src_files:
- public/javascripts/app/helpers/*
- public/javascripts/app/router.js
- public/javascripts/app/views.js
- public/javascripts/app/forms.js
- public/javascripts/app/models/post.js
- public/javascripts/app/models/*
- public/javascripts/app/collections/*
......@@ -54,6 +55,7 @@ src_files:
- public/javascripts/app/views/*.js
- public/javascripts/app/views/**/*.js
- public/javascripts/app/pages/**/*.js
- public/javascripts/app/forms/**/*.js
- public/javascripts/mobile.js
- public/javascripts/contact-list.js
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter