From e9aca40591d166ee4ff6a910ddbdda62974ec1da Mon Sep 17 00:00:00 2001 From: jhendley25 Date: Tue, 18 Feb 2014 11:30:01 -0500 Subject: [PATCH] added backbone-support plugin for awesome view management --- app/index.html | 54 +++++++++++----------- app/scripts/createTrackMasterView.js | 16 +++++++ app/scripts/router.js | 14 +++--- app/scripts/views.js | 69 +++++++++++++++------------- 4 files changed, 89 insertions(+), 64 deletions(-) create mode 100644 app/scripts/createTrackMasterView.js diff --git a/app/index.html b/app/index.html index 39a2d1f..f7d136d 100644 --- a/app/index.html +++ b/app/index.html @@ -55,7 +55,7 @@

All Applicants

💻

App Settings

- +
@@ -63,9 +63,9 @@

App Settings

- +
- +
@@ -74,7 +74,7 @@

App Settings

- +
@@ -89,8 +89,8 @@

Warning

You are missing some info.

Welcome to Step

-
- + +
  • All
  • Completed
    • @@ -446,7 +446,7 @@

    Fake Question

    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    -
    +
@@ -476,9 +476,11 @@

Fake Question

+ + diff --git a/app/scripts/createTrackMasterView.js b/app/scripts/createTrackMasterView.js new file mode 100644 index 0000000..f138c9e --- /dev/null +++ b/app/scripts/createTrackMasterView.js @@ -0,0 +1,16 @@ +CreateTrackMasterView = Support.CompositeView.extend({ + + // template: _.template( $('#track-applicants-template').text() ), + + initialize: function () { + console.log("CreateTrackMasterView init") + + }, + + render: function () { + this.appendChildTo(new CreateTrackView(), '.track-box') + this.appendChildTo(new StepView(), '.track-box') + return this + }, + +}); \ No newline at end of file diff --git a/app/scripts/router.js b/app/scripts/router.js index 5a0bebe..ac3bf66 100644 --- a/app/scripts/router.js +++ b/app/scripts/router.js @@ -1,8 +1,9 @@ console.log('hello router script') -AppRouter = Backbone.Router.extend ({ +AppRouter = Support.SwappingRouter.extend ({ // when router init'd instantiate steps and tracks collections initialize: function(){ + this.el = $("")//fill in this.steps = new StepsCollection(); this.tracks = new TrackCollection(); this.applicants = new ApplicantsCollection(); @@ -21,14 +22,13 @@ AppRouter = Backbone.Router.extend ({ $('.track-window').html('') $('.track-box').html('') $('.main-view').html(''); - new HomeView(); + var view = new HomeView(); + this.swap(view) }, createTrack: function(){ - $('.track-box').html(''); - $('.main-view').html(''); - new CreateTrackView(); - new StepView(); + var view = new CreateTrackMasterView() + this.swap(view) }, yourTracks: function() { @@ -67,4 +67,4 @@ AppRouter = Backbone.Router.extend ({ }) var router = new AppRouter() -Backbone.history.start() \ No newline at end of file +Backbone.history.start() diff --git a/app/scripts/views.js b/app/scripts/views.js index 7d567b5..4dbb62c 100644 --- a/app/scripts/views.js +++ b/app/scripts/views.js @@ -3,7 +3,7 @@ console.log('hello views script') var stepCount = 0; console.log(stepCount); -HomeView = Backbone.View.extend({ +HomeView = Support.CompositeView.extend({ className: 'sign-up', @@ -33,7 +33,7 @@ HomeView = Backbone.View.extend({ user.set("username", username); user.set("password", password); user.set("email", email); - + user.signUp(null, { success: function(user) { // Hooray! Let them use the app now. @@ -50,7 +50,7 @@ HomeView = Backbone.View.extend({ }), -CreateTrackView = Backbone.View.extend({ +CreateTrackView = Support.CompositeView.extend({ template: _.template( $('#create-track-view-template').text() ), @@ -62,25 +62,30 @@ CreateTrackView = Backbone.View.extend({ }, initialize: function() { - $('.track-window').html('') + this.$el = $(".track-box") + // $('.track-window').html('') this.newSteps = []; var firstStep = new Step; - console.log(stepCount); + console.log('CreateTrackView init'); firstStep.number = 1; console.log('the initial step number is ' + firstStep.number) stepCount = firstStep.number; console.log('the step count is ' + stepCount) this.newSteps.push(firstStep); - $('.track-box').append(this.el); + // $('.track-box').append(this.el); this.newTrack = new Track(); - this.render(); + // this.render(); + $(".track-box").append( this.template({item: this.model }) ) + }, render: function () { - this.$el.append( this.template({item: this.model }) ) + console.log("CreateTrackView render called, this.$el is:", this.$el) + return this }, addStep: function(){ + console.log('addStep fired') var addedStep = new Step; addedStep.number = stepCount + 1; stepCount = addedStep.number; @@ -88,7 +93,7 @@ CreateTrackView = Backbone.View.extend({ console.log('the step count is now ' + stepCount) this.newSteps.push(addedStep) // creates new step view to add another step - new StepView(); + this.appendChildTo(new StepView(), '.track-box') }, @@ -119,7 +124,7 @@ CreateTrackView = Backbone.View.extend({ // that.newTrack.relation("steps").add(step) // // adds 1 to the count // count++; - + // if (count == total) { // // now all saves have finished, so we can save the track // that.finalizeSaveTrack() @@ -127,14 +132,14 @@ CreateTrackView = Backbone.View.extend({ // } // }) // }) - // } + // } } // finalizeSaveTrack: function(){ // this.newTrack.save(null, { // success: function(newTrack) { // // Execute any logic that should take place after the object is saved. - // // save steps and set + // // save steps and set // alert('Track Save SUccessful!'); // window.location.href = "#/yourtracks" // }, @@ -143,15 +148,15 @@ CreateTrackView = Backbone.View.extend({ // // error is a Parse.Error with an error code and description. // alert('Failed to create new object, with error code: ' + error.description); // } - + // }); // }, }), -StepView = Backbone.View.extend ({ +StepView = Support.CompositeView.extend ({ - template: _.template( $('#step-view-template').text() ), + template: _.template( $('#step-view-template').text() ), className: 'step-item', @@ -160,16 +165,18 @@ StepView = Backbone.View.extend ({ }, initialize: function() { - $('.track-box').append(this.el); - this.render(); + console.log('StepView init') + // $('.track-box').append(this.el); + // this.render(); }, render: function() { - this.$el.append( this.template({item: this.model }) ); - this.$el.find('.action').select2({ + $(".track-box").append( this.template({item: this.model }) ); + $(".track-box").find('.action').select2({ minimumResultsForSearch: -1, placeholder: 'Choose an action', }); + return this }, deleteStep: function () { @@ -178,11 +185,11 @@ StepView = Backbone.View.extend ({ }), -YourTracksView = Backbone.View.extend({ +YourTracksView = Support.CompositeView.extend({ className: 'yourtracks', - template: _.template( $('#your-tracks-template').text() ), + template: _.template( $('#your-tracks-template').text() ), initialize: function () { $('.applicant').html(''); @@ -199,12 +206,12 @@ YourTracksView = Backbone.View.extend({ }), -TrackView = Backbone.View.extend({ +TrackView = Support.CompositeView.extend({ className: 'track', template: _.template( $('#your-track-view-template').text() ), - + events: { "click .track" : "renderApplicants", }, @@ -221,12 +228,12 @@ TrackView = Backbone.View.extend({ // renderApplicants: function () { // this.track - + // }, }); -TrackApplicantsView = Backbone.View.extend({ +TrackApplicantsView = Support.CompositeView.extend({ template: _.template( $('#track-applicants-template').text() ), @@ -249,7 +256,7 @@ TrackApplicantsView = Backbone.View.extend({ }); -ApplicantView = Backbone.View.extend({ +ApplicantView = Support.CompositeView.extend({ className: 'applicant', @@ -267,7 +274,7 @@ ApplicantView = Backbone.View.extend({ }); -TypeformView = Backbone.View.extend({ +TypeformView = Support.CompositeView.extend({ className: 'applicant-typeform', @@ -291,7 +298,7 @@ TypeformView = Backbone.View.extend({ // // $('.main-view').html(''); // new YourTracksView(); -// // fetching all tracks. +// // fetching all tracks. // this.tracks.fetch({ // success: function(tracks){ // tracks.each(function(track){ @@ -304,7 +311,7 @@ TypeformView = Backbone.View.extend({ function validateSave (){ // reset status - var good = true + var good = true $('.errormessage-left').removeClass('active-left') $('input, select').removeClass("warning") $('input, select').not('.select2-offscreen, .select2-input').each(function(){ @@ -313,7 +320,7 @@ function validateSave (){ good = false $(this).addClass("warning") $('.errormessage-left').addClass('active-left'), - $('.modal').addClass('modal-active'); + $('.modal').addClass('modal-active'); } }) console.log(good) @@ -324,4 +331,4 @@ function validateSave (){ $('.Button-2').click(function () { console.log('done!') $('.modal').removeClass('modal-active'); -}) \ No newline at end of file +})