From 1924c40d38beebedd7e4bb458e1452a3c60a0f7f Mon Sep 17 00:00:00 2001 From: Florian Staudacher Date: Fri, 3 Jan 2014 02:02:38 +0100 Subject: [PATCH] replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem - updates underscore to 1.5.2 and backbone to 1.1.0 backbone had some breaking changes: - fix url/urlRoot handling in models & collections - options are no longer attached to the view by default - collections reset when 'fetch' is called, tell it to keep the existing models other changes: - fix some events triggering multiple times in connection with deleting a model - use document fragments instead of an element array for stream entries - adapt jasmine and cucumber specs to the changed code * no longer test the backbone router as part of our code * jasmine factory already returns model instances, no need to wrap that again --- Changelog.md | 1 + Gemfile | 1 + Gemfile.lock | 12 + .../javascripts/app/collections/comments.js | 13 +- app/assets/javascripts/app/models/stream.js | 12 +- app/assets/javascripts/app/views.js | 21 +- .../app/views/infinite_stream_view.js | 29 +- .../views/publisher/aspect_selector_view.js | 8 +- .../views/publisher/getting_started_view.js | 16 +- .../app/views/publisher/services_view.js | 13 +- .../app/views/publisher/uploader_view.js | 18 +- .../javascripts/app/views/publisher_view.js | 6 +- .../app/views/stream_post_views.js | 3 +- config/locales/javascript/javascript.en.yml | 1 + features/step_definitions/custom_web_steps.rb | 7 +- features/step_definitions/web_steps.rb | 4 +- features/support/paths.rb | 19 +- spec/javascripts/app/models/stream_spec.js | 4 +- spec/javascripts/app/router_spec.js | 42 +- .../app/views/comment_stream_view_spec.js | 9 +- spec/javascripts/bookmarklet-spec.js | 4 +- vendor/assets/javascripts/backbone.js | 1431 ----------------- vendor/assets/javascripts/underscore.js | 999 ------------ 23 files changed, 147 insertions(+), 2526 deletions(-) delete mode 100644 vendor/assets/javascripts/backbone.js delete mode 100644 vendor/assets/javascripts/underscore.js diff --git a/Changelog.md b/Changelog.md index aa63bc5b4..7391d1be8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -79,6 +79,7 @@ For more details see https://wiki.diasporafoundation.org/Updating * Added a statistics route with general pod information, and if enabled in pod settings, total user, half year/monthly active users and local post counts [#4602](https://github.com/diaspora/diaspora/pull/4602) * Add indication about markdown formatting in the publisher [#4589](https://github.com/diaspora/diaspora/pull/4589) * Add captcha to signup form [#4659](https://github.com/diaspora/diaspora/pull/4659) +* Update Underscore.js 1.3.1 to 1.5.2, update Backbone.js 0.9.2 to 1.1.0 [#4662](https://github.com/diaspora/diaspora/pull/4662) ## Gem updates * selenium-webdriver 2.34.0 -> 2.39.0 diff --git a/Gemfile b/Gemfile index fcf1f4764..f1a505f4e 100644 --- a/Gemfile +++ b/Gemfile @@ -125,6 +125,7 @@ group :assets do # JavaScript + gem 'backbone-on-rails', '1.1.0' gem 'handlebars_assets', '0.12.0' gem 'jquery-rails', '2.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index edd21c73b..f0069cccd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,6 +43,11 @@ GEM fog (>= 1.8.0) atomic (1.1.14) bcrypt-ruby (3.1.2) + backbone-on-rails (1.1.0.0) + eco + ejs + jquery-rails + rails (>= 3.1) bootstrap-sass (2.2.2.0) sass (~> 3.2) builder (3.0.4) @@ -99,6 +104,12 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.5) + eco (1.0.0) + coffee-script + eco-source + execjs + eco-source (1.1.0.rc.1) + ejs (1.1.1) entypo-rails (2.0.2) railties (>= 3.1, <= 5) erubis (2.7.0) @@ -436,6 +447,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.5) asset_sync (= 1.0.0) + backbone-on-rails (= 1.1.0) bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) carrierwave (= 0.9.0) diff --git a/app/assets/javascripts/app/collections/comments.js b/app/assets/javascripts/app/collections/comments.js index d25d85128..06ae95fe2 100644 --- a/app/assets/javascripts/app/collections/comments.js +++ b/app/assets/javascripts/app/collections/comments.js @@ -1,21 +1,18 @@ app.collections.Comments = Backbone.Collection.extend({ model: app.models.Comment, - - url : function(){ - return this.post.url() + "/comments" - }, + url: function() { return _.result(this.post, 'url') + '/comments'; }, initialize : function(models, options) { - this.post = options.post + this.post = options.post; }, make : function(text){ - var self = this + var self = this; - var comment = new app.models.Comment({text: text }) + var comment = new app.models.Comment({text: text }); var deferred = comment.save({}, { - url : self.url(), + url: '/posts/'+this.post.id+'/comments', success: function() { comment.set({author: app.currentUser.toJSON(), parent: self.post }) self.add(comment) diff --git a/app/assets/javascripts/app/models/stream.js b/app/assets/javascripts/app/models/stream.js index 2af816384..f417016fc 100644 --- a/app/assets/javascripts/app/models/stream.js +++ b/app/assets/javascripts/app/models/stream.js @@ -16,16 +16,16 @@ app.models.Stream = Backbone.Collection.extend({ }, fetch: function() { - if(this.isFetching()){ return false } - var url = this.url() + if( this.isFetching() ) return false; + var url = this.url(); this.deferred = this.items.fetch({ - add : true, + remove : false, url : url }).done(_.bind(this.triggerFetchedEvents, this)) }, - isFetching : function(){ - return this.deferred && this.deferred.state() == "pending" + isFetching : function() { + return (this.deferred && this.deferred.state() == "pending"); }, triggerFetchedEvents : function(resp){ @@ -56,7 +56,7 @@ app.models.Stream = Backbone.Collection.extend({ /* This function is for adding a large number of posts one by one. * Mainly used by backbone when loading posts from the server - * + * * After adding the posts, you have to trigger "fetched" on the * stream for the changes to take effect in the infinite stream view */ diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js index d9871d22c..6838b12d8 100644 --- a/app/assets/javascripts/app/views.js +++ b/app/assets/javascripts/app/views.js @@ -9,11 +9,6 @@ app.views.Base = Backbone.View.extend({ }, setupRenderEvents : function(){ - 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. // @@ -88,9 +83,21 @@ app.views.Base = Backbone.View.extend({ destroyModel: function(evt) { evt && evt.preventDefault(); + var self = this; + var url = this.model.urlRoot + '/' + this.model.id; + if (confirm(Diaspora.I18n.t("confirm_dialog"))) { - this.model.destroy(); - this.remove(); + this.model.destroy({ url: url }) + .done(function() { + self.remove(); + }) + .fail(function() { + var flash = new Diaspora.Widgets.FlashMessages; + flash.render({ + success: false, + notice: Diaspora.I18n.t('failed_to_remove') + }); + }); } } }); diff --git a/app/assets/javascripts/app/views/infinite_stream_view.js b/app/assets/javascripts/app/views/infinite_stream_view.js index 06963672b..a1f3066f3 100644 --- a/app/assets/javascripts/app/views/infinite_stream_view.js +++ b/app/assets/javascripts/app/views/infinite_stream_view.js @@ -9,8 +9,7 @@ app.views.InfScroll = app.views.Base.extend({ setupInfiniteScroll : function() { this.postViews = this.postViews || []; - this.appendedPosts = []; - this.prependedPosts = []; + this._resetPostFragments(); this.bind("loadMore", this.fetchAndshowLoader, this); this.stream.bind("fetched", this.finishedLoading, this); @@ -22,6 +21,11 @@ app.views.InfScroll = app.views.Base.extend({ $(window).scroll(throttledScroll); }, + _resetPostFragments: function() { + this.appendedPosts = document.createDocumentFragment(); + this.prependedPosts = document.createDocumentFragment(); + }, + postRenderTemplate : function() { if(this.stream.isFetching()) { this.showLoader() } }, @@ -29,6 +33,7 @@ app.views.InfScroll = app.views.Base.extend({ createPostView : function(post){ var postView = new this.postClass({ model: post, stream: this.stream }); if (this.collection.at(0).id == post.id) { + // post is first in collection - insert view at top of the list this.postViews.unshift(postView); } else { this.postViews.push(postView); @@ -36,12 +41,13 @@ app.views.InfScroll = app.views.Base.extend({ return postView; }, + // called for every item inserted in this.collection addPostView : function(post) { var el = this.createPostView(post).render().el; if (this.collection.at(0).id == post.id) { - this.prependedPosts.unshift(el); + this.prependedPosts.insertBefore(el, this.prependedPosts.firstChild); } else { - this.appendedPosts.push(el); + this.appendedPosts.appendChild(el); } }, @@ -55,15 +61,16 @@ app.views.InfScroll = app.views.Base.extend({ renderInitialPosts : function(){ this.$el.empty(); - var els = []; + var els = document.createDocumentFragment(); this.stream.items.each(_.bind(function(post){ - els.push(this.createPostView(post).render().el); + els.appendChild(this.createPostView(post).render().el); }, this)) - this.$el.append(els); + this.$el.html(els); }, fetchAndshowLoader : function(){ - if(this.stream.isFetching()) { return false } + if( this.stream.isFetching() ) return false; + this.stream.fetch(); this.showLoader(); }, @@ -73,11 +80,9 @@ app.views.InfScroll = app.views.Base.extend({ }, finishedAdding: function() { - var el = $(''); this.$el.prepend(this.prependedPosts); this.$el.append(this.appendedPosts); - this.appendedPosts = []; - this.prependedPosts = []; + this._resetPostFragments(); }, finishedLoading: function() { @@ -96,7 +101,7 @@ app.views.InfScroll = app.views.Base.extend({ , bufferPx = 500; if(distFromBottom < bufferPx) { - this.trigger("loadMore") + this.trigger("loadMore"); } } }); diff --git a/app/assets/javascripts/app/views/publisher/aspect_selector_view.js b/app/assets/javascripts/app/views/publisher/aspect_selector_view.js index 49c0f6567..27b9eccc3 100644 --- a/app/assets/javascripts/app/views/publisher/aspect_selector_view.js +++ b/app/assets/javascripts/app/views/publisher/aspect_selector_view.js @@ -12,6 +12,10 @@ app.views.PublisherAspectSelector = Backbone.View.extend({ "click .dropdown_list > li": "toggleAspect" }, + initialize: function(opts) { + this.form = opts.form; + }, + // event handler for aspect selection toggleAspect: function(evt) { var el = $(evt.target); @@ -53,7 +57,7 @@ app.views.PublisherAspectSelector = Backbone.View.extend({ var self = this; // remove previous selection - this.options.form.find('input[name="aspect_ids[]"]').remove(); + this.form.find('input[name="aspect_ids[]"]').remove(); // create fields for current selection this.$('.dropdown_list li.selected').each(function() { @@ -80,7 +84,7 @@ app.views.PublisherAspectSelector = Backbone.View.extend({ _addHiddenAspectInput: function(id) { var uid = _.uniqueId('aspect_ids_'); - this.options.form.append( + this.form.append( '' ); } diff --git a/app/assets/javascripts/app/views/publisher/getting_started_view.js b/app/assets/javascripts/app/views/publisher/getting_started_view.js index cee509884..bd45bf5d4 100644 --- a/app/assets/javascripts/app/views/publisher/getting_started_view.js +++ b/app/assets/javascripts/app/views/publisher/getting_started_view.js @@ -8,23 +8,29 @@ // for describing their use to new users. app.views.PublisherGettingStarted = Backbone.View.extend({ + initialize: function(opts) { + this.el_first_msg = opts.el_first_msg; + this.el_visibility = opts.el_visibility; + this.el_stream = opts.el_stream; + }, + // initiate all the popover message boxes show: function() { - this._addPopover(this.options.el_first_msg, { + this._addPopover(this.el_first_msg, { trigger: 'manual', offset: 30, id: 'first_message_explain', placement: 'right', html: true }, 600); - this._addPopover(this.options.el_visibility, { + this._addPopover(this.el_visibility, { trigger: 'manual', offset: 10, id: 'message_visibility_explain', placement: 'bottom', html: true }, 1000); - this._addPopover(this.options.el_stream, { + this._addPopover(this.el_stream, { trigger: 'manual', offset: -5, id: 'stream_explain', @@ -34,8 +40,8 @@ app.views.PublisherGettingStarted = Backbone.View.extend({ // hide some popovers when a post is created this.$('.button.creation').click(function() { - this.options.el_visibility.popover('hide'); - this.options.el_first_msg.popover('hide'); + this.el_visibility.popover('hide'); + this.el_first_msg.popover('hide'); }); }, diff --git a/app/assets/javascripts/app/views/publisher/services_view.js b/app/assets/javascripts/app/views/publisher/services_view.js index fd2a8c534..a788cadbd 100644 --- a/app/assets/javascripts/app/views/publisher/services_view.js +++ b/app/assets/javascripts/app/views/publisher/services_view.js @@ -13,7 +13,10 @@ app.views.PublisherServices = Backbone.View.extend({ tooltipSelector: '.service_icon', - initialize: function() { + initialize: function(opts) { + this.input = opts.input; + this.form = opts.form; + // init tooltip plugin this.$(this.tooltipSelector).tooltip(); }, @@ -32,7 +35,7 @@ app.views.PublisherServices = Backbone.View.extend({ // keep track of character count _createCounter: function() { // remove any obsolete counters - this.options.input.siblings('.counter').remove(); + this.input.siblings('.counter').remove(); // create new counter var min = 40000; @@ -42,18 +45,18 @@ app.views.PublisherServices = Backbone.View.extend({ var num = parseInt($(value).attr('maxchar')); if (min > num) { min = num; } }); - this.options.input.charCount({allowed: min, warning: min/10 }); + this.input.charCount({allowed: min, warning: min/10 }); } }, // add or remove the input containing the selected service _toggleServiceField: function(provider) { - var hidden_field = this.options.form.find('input[name="services[]"][value="'+provider+'"]'); + var hidden_field = this.form.find('input[name="services[]"][value="'+provider+'"]'); if(hidden_field.length > 0){ hidden_field.remove(); } else { var uid = _.uniqueId('services_'); - this.options.form.append( + this.form.append( ''); } } diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js index 730850ebe..399021813 100644 --- a/app/assets/javascripts/app/views/publisher/uploader_view.js +++ b/app/assets/javascripts/app/views/publisher/uploader_view.js @@ -8,7 +8,9 @@ app.views.PublisherUploader = Backbone.View.extend({ allowedExtensions: ['jpg', 'jpeg', 'png', 'gif', 'tif', 'tiff'], sizeLimit: 4194304, // bytes - initialize: function() { + initialize: function(opts) { + this.publisher = opts.publisher; + this.uploader = new qq.FileUploaderBasic({ element: this.el, button: this.el, @@ -31,9 +33,9 @@ app.views.PublisherUploader = Backbone.View.extend({ }); this.el_info = $('
'); - this.options.publisher.el_wrapper.before(this.el_info); + this.publisher.el_wrapper.before(this.el_info); - this.options.publisher.el_photozone.on('click', '.x', _.bind(this._removePhoto, this)); + this.publisher.el_photozone.on('click', '.x', _.bind(this._removePhoto, this)); }, progressHandler: function(id, fileName, loaded, total) { @@ -48,7 +50,7 @@ app.views.PublisherUploader = Backbone.View.extend({ // add photo placeholders to the publisher to indicate an upload in progress _addPhotoPlaceholder: function() { - var publisher = this.options.publisher; + var publisher = this.publisher; publisher.setButtonsEnabled(false); publisher.el_wrapper.addClass('with_attachments'); @@ -78,7 +80,7 @@ app.views.PublisherUploader = Backbone.View.extend({ // replace the first photo placeholder with the finished uploaded image and // add the id to the publishers form _addFinishedPhoto: function(id, url) { - var publisher = this.options.publisher; + var publisher = this.publisher; // add form input element publisher.$('.content_creation form').append( @@ -103,7 +105,7 @@ app.views.PublisherUploader = Backbone.View.extend({ }, _cancelPhotoUpload: function() { - var publisher = this.options.publisher; + var publisher = this.publisher; var placeholder = publisher.el_photozone.find('li.loading').first(); placeholder .removeClass('loading') @@ -125,9 +127,9 @@ app.views.PublisherUploader = Backbone.View.extend({ $.when(photo.fadeOut(400)).then(function(){ photo.remove(); - if( self.options.publisher.$('.publisher_photo').length == 0 ) { + if( self.publisher.$('.publisher_photo').length == 0 ) { // no more photos left... - self.options.publisher.el_wrapper.removeClass('with_attachments'); + self.publisher.el_wrapper.removeClass('with_attachments'); } self.trigger('change'); diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index 00ff2fd61..1ef5b7cef 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -25,7 +25,9 @@ app.views.Publisher = Backbone.View.extend({ "keypress #location_address" : "avoidEnter" }, - initialize : function(){ + initialize : function(opts){ + this.standalone = opts ? opts.standalone : false; + // init shortcut references to the various elements this.el_input = this.$('#status_message_fake_text'); this.el_hiddenInput = this.$('#status_message_text'); @@ -47,7 +49,7 @@ app.views.Publisher = Backbone.View.extend({ // hide close and preview buttons, in case publisher is standalone // (e.g. bookmarklet, mentions popup) - if( this.options.standalone ) { + if( this.standalone ) { this.$('#hide_publisher').hide(); this.el_preview.hide(); } diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js index 0c8faafe7..02f281b40 100644 --- a/app/assets/javascripts/app/views/stream_post_views.js +++ b/app/assets/javascripts/app/views/stream_post_views.js @@ -25,8 +25,7 @@ app.views.StreamPost = app.views.Post.extend({ tooltipSelector : ".timeago, .post_scope, .block_user, .delete", initialize : function(){ - this.model.bind('remove', this.remove, this); - + this.model.on('remove', this.remove, this); //subviews this.commentStreamView = new app.views.CommentStream({model : this.model}); this.oEmbedView = new app.views.OEmbed({model : this.model}); diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index b24371dfd..3504d75e2 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -60,6 +60,7 @@ en: show_more: "show more" failed_to_like: "Failed to like!" failed_to_post_message: "Failed to post message!" + failed_to_remove: "Failed to remove the entry!" comments: show: "show all comments" hide: "hide comments" diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index abfc4b30a..0c282b021 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -105,9 +105,10 @@ And /^I hover over the "([^"]+)"$/ do |element| end When /^I prepare the deletion of the first post$/ do - within('.stream_element', match: :first) do - find('.controls').hover - find('.remove_post').click + within(find('.stream .stream_element')) do + ctrl = find('.controls') + ctrl.hover + ctrl.find('.remove_post').click end end diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index e43b12da9..fa718fe41 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -20,11 +20,11 @@ end World(WithinHelpers) Given /^(?:|I )am on (.+)$/ do |page_name| - visit path_to(page_name) + navigate_to(page_name) end When /^(?:|I )go to (.+)$/ do |page_name| - visit path_to(page_name) + navigate_to(page_name) end When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector| diff --git a/features/support/paths.rb b/features/support/paths.rb index fd18b67be..c5d7756bd 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -26,7 +26,11 @@ module NavigationHelpers when /^the requestors profile$/ person_path(Request.where(:recipient_id => @me.person.id).first.sender) when /^"([^\"]*)"'s page$/ - person_path(User.find_by_email($1).person) + p = User.find_by_email($1).person + { path: person_path(p), + # '.diaspora_handle' on desktop, '.description' on mobile + special_elem: { selector: '.diaspora_handle, .description', text: p.diaspora_handle } + } when /^my account settings page$/ edit_user_path when /^my new profile page$/ @@ -46,10 +50,21 @@ module NavigationHelpers path_to "the new user session page" end - def post_path_by_content text + def post_path_by_content(text) p = Post.find_by_text(text) post_path(p) end + + def navigate_to(page_name) + path = path_to(page_name) + unless path.is_a?(Hash) + visit(path) + else + visit(path[:path]) + await_elem = path[:special_elem] + find(await_elem.delete(:selector), await_elem) + end + end end World(NavigationHelpers) diff --git a/spec/javascripts/app/models/stream_spec.js b/spec/javascripts/app/models/stream_spec.js index 81454b84d..2b0094234 100644 --- a/spec/javascripts/app/models/stream_spec.js +++ b/spec/javascripts/app/models/stream_spec.js @@ -16,7 +16,7 @@ describe("app.models.Stream", function() { it("it fetches posts from the window's url, and ads them to the collection", function() { this.stream.fetch() - expect(this.stream.items.fetch).toHaveBeenCalledWith({ add : true, url : this.expectedPath}); + expect(this.stream.items.fetch).toHaveBeenCalledWith({ remove: false, url: this.expectedPath}); }); it("returns the json path with max_time if the collection has models", function() { @@ -25,7 +25,7 @@ describe("app.models.Stream", function() { this.stream.add(post); this.stream.fetch() - expect(this.stream.items.fetch).toHaveBeenCalledWith({ add : true, url : this.expectedPath + "?max_time=1234"}); + expect(this.stream.items.fetch).toHaveBeenCalledWith({ remove: false, url: this.expectedPath + "?max_time=1234"}); }); it("triggers fetched on the stream when it is fetched", function(){ diff --git a/spec/javascripts/app/router_spec.js b/spec/javascripts/app/router_spec.js index ff29045a7..543abef09 100644 --- a/spec/javascripts/app/router_spec.js +++ b/spec/javascripts/app/router_spec.js @@ -34,42 +34,38 @@ describe('app.Router', function () { }); describe("when routing to /stream and hiding inactive stream lists", function() { + var router; + var aspects; + var tagFollowings; + + beforeEach(function() { + router = new app.Router(); + }); + it('calls hideInactiveStreamLists', function () { - var hideInactiveStreamLists = spyOn(app.router, 'hideInactiveStreamLists').andCallThrough(); - spyOn(window.history, 'pushState').andCallFake(function (data, title, url) { - var route = app.router._routeToRegExp("stream"); - var args = app.router._extractParameters(route, url.replace(/^\//, "")); - app.router.stream(args[0]); - }); - app.router.navigate('/stream'); + var hideInactiveStreamLists = spyOn(router, 'hideInactiveStreamLists').andCallThrough(); + + router.stream(); expect(hideInactiveStreamLists).toHaveBeenCalled(); }); it('hides the aspects list', function(){ - var aspects = new app.collections.Aspects([{ name: 'Work', selected: true }]); + aspects = new app.collections.Aspects([{ name: 'Work', selected: true }]); var aspectsListView = new app.views.AspectsList({collection: aspects}); var hideAspectsList = spyOn(aspectsListView, 'hideAspectsList').andCallThrough(); - app.router.aspects_list = aspectsListView; - spyOn(window.history, 'pushState').andCallFake(function (data, title, url) { - var route = app.router._routeToRegExp("stream"); - var args = app.router._extractParameters(route, url.replace(/^\//, "")); - app.router.stream(args[0]); - }); - app.router.navigate('/stream'); + router.aspects_list = aspectsListView; + + router.stream(); expect(hideAspectsList).toHaveBeenCalled(); }); it('hides the followed tags view', function(){ - var tagFollowings = new app.collections.TagFollowings(); + tagFollowings = new app.collections.TagFollowings(); var followedTagsView = new app.views.TagFollowingList({collection: tagFollowings}); var hideFollowedTags = spyOn(followedTagsView, 'hideFollowedTags').andCallThrough(); - app.router.followedTagsView = followedTagsView; - spyOn(window.history, 'pushState').andCallFake(function (data, title, url) { - var route = app.router._routeToRegExp("stream"); - var args = app.router._extractParameters(route, url.replace(/^\//, "")); - app.router.stream(args[0]); - }); - app.router.navigate('/stream'); + router.followedTagsView = followedTagsView; + + router.stream(); expect(hideFollowedTags).toHaveBeenCalled(); }); }); diff --git a/spec/javascripts/app/views/comment_stream_view_spec.js b/spec/javascripts/app/views/comment_stream_view_spec.js index c5c3ba430..22b2db68d 100644 --- a/spec/javascripts/app/views/comment_stream_view_spec.js +++ b/spec/javascripts/app/views/comment_stream_view_spec.js @@ -81,11 +81,10 @@ describe("app.views.CommentStream", function(){ describe("appendComment", function(){ it("appends this.model as 'parent' to the comment", function(){ - var comment = new app.models.Comment(factory.comment()) - - spyOn(comment, "set") - this.view.appendComment(comment) - expect(comment.set).toHaveBeenCalled() + var comment = factory.comment(); + spyOn(comment, "set"); + this.view.appendComment(comment); + expect(comment.set).toHaveBeenCalled(); }); }); diff --git a/spec/javascripts/bookmarklet-spec.js b/spec/javascripts/bookmarklet-spec.js index 9e854760a..e9eb63363 100644 --- a/spec/javascripts/bookmarklet-spec.js +++ b/spec/javascripts/bookmarklet-spec.js @@ -15,7 +15,7 @@ describe("bookmarklet", function() { }); it('verifies we are using the bookmarklet', function(){ - expect(app.publisher.options.standalone).toBeTruthy(); + expect(app.publisher.standalone).toBeTruthy(); expect(app.publisher.$('#hide_publisher').is(':visible')).toBeFalsy(); }); }); @@ -37,7 +37,7 @@ describe("bookmarklet", function() { }); }); }); - + describe("modified prefilled bookmarklet", function(){ it('allows changing of post content', function(){ spec.loadFixture('prefilled_bookmarklet'); diff --git a/vendor/assets/javascripts/backbone.js b/vendor/assets/javascripts/backbone.js deleted file mode 100644 index 3373c952b..000000000 --- a/vendor/assets/javascripts/backbone.js +++ /dev/null @@ -1,1431 +0,0 @@ -// Backbone.js 0.9.2 - -// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc. -// Backbone may be freely distributed under the MIT license. -// For all details and documentation: -// http://backbonejs.org - -(function(){ - - // Initial Setup - // ------------- - - // Save a reference to the global object (`window` in the browser, `global` - // on the server). - var root = this; - - // Save the previous value of the `Backbone` variable, so that it can be - // restored later on, if `noConflict` is used. - var previousBackbone = root.Backbone; - - // Create a local reference to slice/splice. - var slice = Array.prototype.slice; - var splice = Array.prototype.splice; - - // The top-level namespace. All public Backbone classes and modules will - // be attached to this. Exported for both CommonJS and the browser. - var Backbone; - if (typeof exports !== 'undefined') { - Backbone = exports; - } else { - Backbone = root.Backbone = {}; - } - - // Current version of the library. Keep in sync with `package.json`. - Backbone.VERSION = '0.9.2'; - - // Require Underscore, if we're on the server, and it's not already present. - var _ = root._; - if (!_ && (typeof require !== 'undefined')) _ = require('underscore'); - - // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable. - var $ = root.jQuery || root.Zepto || root.ender; - - // Set the JavaScript library that will be used for DOM manipulation and - // Ajax calls (a.k.a. the `$` variable). By default Backbone will use: jQuery, - // Zepto, or Ender; but the `setDomLibrary()` method lets you inject an - // alternate JavaScript library (or a mock library for testing your views - // outside of a browser). - Backbone.setDomLibrary = function(lib) { - $ = lib; - }; - - // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable - // to its previous owner. Returns a reference to this Backbone object. - Backbone.noConflict = function() { - root.Backbone = previousBackbone; - return this; - }; - - // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option - // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and - // set a `X-Http-Method-Override` header. - Backbone.emulateHTTP = false; - - // Turn on `emulateJSON` to support legacy servers that can't deal with direct - // `application/json` requests ... will encode the body as - // `application/x-www-form-urlencoded` instead and will send the model in a - // form param named `model`. - Backbone.emulateJSON = false; - - // Backbone.Events - // ----------------- - - // Regular expression used to split event strings - var eventSplitter = /\s+/; - - // A module that can be mixed in to *any object* in order to provide it with - // custom events. You may bind with `on` or remove with `off` callback functions - // to an event; trigger`-ing an event fires all callbacks in succession. - // - // var object = {}; - // _.extend(object, Backbone.Events); - // object.on('expand', function(){ alert('expanded'); }); - // object.trigger('expand'); - // - var Events = Backbone.Events = { - - // Bind one or more space separated events, `events`, to a `callback` - // function. Passing `"all"` will bind the callback to all events fired. - on: function(events, callback, context) { - - var calls, event, node, tail, list; - if (!callback) return this; - events = events.split(eventSplitter); - calls = this._callbacks || (this._callbacks = {}); - - // Create an immutable callback list, allowing traversal during - // modification. The tail is an empty object that will always be used - // as the next node. - while (event = events.shift()) { - list = calls[event]; - node = list ? list.tail : {}; - node.next = tail = {}; - node.context = context; - node.callback = callback; - calls[event] = {tail: tail, next: list ? list.next : node}; - } - - return this; - }, - - // Remove one or many callbacks. If `context` is null, removes all callbacks - // with that function. If `callback` is null, removes all callbacks for the - // event. If `events` is null, removes all bound callbacks for all events. - off: function(events, callback, context) { - var event, calls, node, tail, cb, ctx; - - // No events, or removing *all* events. - if (!(calls = this._callbacks)) return; - if (!(events || callback || context)) { - delete this._callbacks; - return this; - } - - // Loop through the listed events and contexts, splicing them out of the - // linked list of callbacks if appropriate. - events = events ? events.split(eventSplitter) : _.keys(calls); - while (event = events.shift()) { - node = calls[event]; - delete calls[event]; - if (!node || !(callback || context)) continue; - // Create a new list, omitting the indicated callbacks. - tail = node.tail; - while ((node = node.next) !== tail) { - cb = node.callback; - ctx = node.context; - if ((callback && cb !== callback) || (context && ctx !== context)) { - this.on(event, cb, ctx); - } - } - } - - return this; - }, - - // Trigger one or many events, firing all bound callbacks. Callbacks are - // passed the same arguments as `trigger` is, apart from the event name - // (unless you're listening on `"all"`, which will cause your callback to - // receive the true name of the event as the first argument). - trigger: function(events) { - var event, node, calls, tail, args, all, rest; - if (!(calls = this._callbacks)) return this; - all = calls.all; - events = events.split(eventSplitter); - rest = slice.call(arguments, 1); - - // For each event, walk through the linked list of callbacks twice, - // first to trigger the event, then to trigger any `"all"` callbacks. - while (event = events.shift()) { - if (node = calls[event]) { - tail = node.tail; - while ((node = node.next) !== tail) { - node.callback.apply(node.context || this, rest); - } - } - if (node = all) { - tail = node.tail; - args = [event].concat(rest); - while ((node = node.next) !== tail) { - node.callback.apply(node.context || this, args); - } - } - } - - return this; - } - - }; - - // Aliases for backwards compatibility. - Events.bind = Events.on; - Events.unbind = Events.off; - - // Backbone.Model - // -------------- - - // Create a new model, with defined attributes. A client id (`cid`) - // is automatically generated and assigned for you. - var Model = Backbone.Model = function(attributes, options) { - var defaults; - attributes || (attributes = {}); - if (options && options.parse) attributes = this.parse(attributes); - if (defaults = getValue(this, 'defaults')) { - attributes = _.extend({}, defaults, attributes); - } - if (options && options.collection) this.collection = options.collection; - this.attributes = {}; - this._escapedAttributes = {}; - this.cid = _.uniqueId('c'); - this.changed = {}; - this._silent = {}; - this._pending = {}; - this.set(attributes, {silent: true}); - // Reset change tracking. - this.changed = {}; - this._silent = {}; - this._pending = {}; - this._previousAttributes = _.clone(this.attributes); - this.initialize.apply(this, arguments); - }; - - // Attach all inheritable methods to the Model prototype. - _.extend(Model.prototype, Events, { - - // A hash of attributes whose current and previous value differ. - changed: null, - - // A hash of attributes that have silently changed since the last time - // `change` was called. Will become pending attributes on the next call. - _silent: null, - - // A hash of attributes that have changed since the last `'change'` event - // began. - _pending: null, - - // The default name for the JSON `id` attribute is `"id"`. MongoDB and - // CouchDB users may want to set this to `"_id"`. - idAttribute: 'id', - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // Return a copy of the model's `attributes` object. - toJSON: function(options) { - return _.clone(this.attributes); - }, - - // Get the value of an attribute. - get: function(attr) { - return this.attributes[attr]; - }, - - // Get the HTML-escaped value of an attribute. - escape: function(attr) { - var html; - if (html = this._escapedAttributes[attr]) return html; - var val = this.get(attr); - return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val); - }, - - // Returns `true` if the attribute contains a value that is not null - // or undefined. - has: function(attr) { - return this.get(attr) != null; - }, - - // Set a hash of model attributes on the object, firing `"change"` unless - // you choose to silence it. - set: function(key, value, options) { - var attrs, attr, val; - - // Handle both `"key", value` and `{key: value}` -style arguments. - if (_.isObject(key) || key == null) { - attrs = key; - options = value; - } else { - attrs = {}; - attrs[key] = value; - } - - // Extract attributes and options. - options || (options = {}); - if (!attrs) return this; - if (attrs instanceof Model) attrs = attrs.attributes; - if (options.unset) for (attr in attrs) attrs[attr] = void 0; - - // Run validation. - if (!this._validate(attrs, options)) return false; - - // Check for changes of `id`. - if (this.idAttribute in attrs) this.id = attrs[this.idAttribute]; - - var changes = options.changes = {}; - var now = this.attributes; - var escaped = this._escapedAttributes; - var prev = this._previousAttributes || {}; - - // For each `set` attribute... - for (attr in attrs) { - val = attrs[attr]; - - // If the new and current value differ, record the change. - if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) { - delete escaped[attr]; - (options.silent ? this._silent : changes)[attr] = true; - } - - // Update or delete the current value. - options.unset ? delete now[attr] : now[attr] = val; - - // If the new and previous value differ, record the change. If not, - // then remove changes for this attribute. - if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) { - this.changed[attr] = val; - if (!options.silent) this._pending[attr] = true; - } else { - delete this.changed[attr]; - delete this._pending[attr]; - } - } - - // Fire the `"change"` events. - if (!options.silent) this.change(options); - return this; - }, - - // Remove an attribute from the model, firing `"change"` unless you choose - // to silence it. `unset` is a noop if the attribute doesn't exist. - unset: function(attr, options) { - (options || (options = {})).unset = true; - return this.set(attr, null, options); - }, - - // Clear all attributes on the model, firing `"change"` unless you choose - // to silence it. - clear: function(options) { - (options || (options = {})).unset = true; - return this.set(_.clone(this.attributes), options); - }, - - // Fetch the model from the server. If the server's representation of the - // model differs from its current attributes, they will be overriden, - // triggering a `"change"` event. - fetch: function(options) { - options = options ? _.clone(options) : {}; - var model = this; - var success = options.success; - options.success = function(resp, status, xhr) { - if (!model.set(model.parse(resp, xhr), options)) return false; - if (success) success(model, resp); - }; - options.error = Backbone.wrapError(options.error, model, options); - return (this.sync || Backbone.sync).call(this, 'read', this, options); - }, - - // Set a hash of model attributes, and sync the model to the server. - // If the server returns an attributes hash that differs, the model's - // state will be `set` again. - save: function(key, value, options) { - var attrs, current; - - // Handle both `("key", value)` and `({key: value})` -style calls. - if (_.isObject(key) || key == null) { - attrs = key; - options = value; - } else { - attrs = {}; - attrs[key] = value; - } - options = options ? _.clone(options) : {}; - - // If we're "wait"-ing to set changed attributes, validate early. - if (options.wait) { - if (!this._validate(attrs, options)) return false; - current = _.clone(this.attributes); - } - - // Regular saves `set` attributes before persisting to the server. - var silentOptions = _.extend({}, options, {silent: true}); - if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) { - return false; - } - - // After a successful server-side save, the client is (optionally) - // updated with the server-side state. - var model = this; - var success = options.success; - options.success = function(resp, status, xhr) { - var serverAttrs = model.parse(resp, xhr); - if (options.wait) { - delete options.wait; - serverAttrs = _.extend(attrs || {}, serverAttrs); - } - if (!model.set(serverAttrs, options)) return false; - if (success) { - success(model, resp); - } else { - model.trigger('sync', model, resp, options); - } - }; - - // Finish configuring and sending the Ajax request. - options.error = Backbone.wrapError(options.error, model, options); - var method = this.isNew() ? 'create' : 'update'; - var xhr = (this.sync || Backbone.sync).call(this, method, this, options); - if (options.wait) this.set(current, silentOptions); - return xhr; - }, - - // Destroy this model on the server if it was already persisted. - // Optimistically removes the model from its collection, if it has one. - // If `wait: true` is passed, waits for the server to respond before removal. - destroy: function(options) { - options = options ? _.clone(options) : {}; - var model = this; - var success = options.success; - - var triggerDestroy = function() { - model.trigger('destroy', model, model.collection, options); - }; - - if (this.isNew()) { - triggerDestroy(); - return false; - } - - options.success = function(resp) { - if (options.wait) triggerDestroy(); - if (success) { - success(model, resp); - } else { - model.trigger('sync', model, resp, options); - } - }; - - options.error = Backbone.wrapError(options.error, model, options); - var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options); - if (!options.wait) triggerDestroy(); - return xhr; - }, - - // Default URL for the model's representation on the server -- if you're - // using Backbone's restful methods, override this to change the endpoint - // that will be called. - url: function() { - var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError(); - if (this.isNew()) return base; - return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id); - }, - - // **parse** converts a response into the hash of attributes to be `set` on - // the model. The default implementation is just to pass the response along. - parse: function(resp, xhr) { - return resp; - }, - - // Create a new model with identical attributes to this one. - clone: function() { - return new this.constructor(this.attributes); - }, - - // A model is new if it has never been saved to the server, and lacks an id. - isNew: function() { - return this.id == null; - }, - - // Call this method to manually fire a `"change"` event for this model and - // a `"change:attribute"` event for each changed attribute. - // Calling this will cause all objects observing the model to update. - change: function(options) { - options || (options = {}); - var changing = this._changing; - this._changing = true; - - // Silent changes become pending changes. - for (var attr in this._silent) this._pending[attr] = true; - - // Silent changes are triggered. - var changes = _.extend({}, options.changes, this._silent); - this._silent = {}; - for (var attr in changes) { - this.trigger('change:' + attr, this, this.get(attr), options); - } - if (changing) return this; - - // Continue firing `"change"` events while there are pending changes. - while (!_.isEmpty(this._pending)) { - this._pending = {}; - this.trigger('change', this, options); - // Pending and silent changes still remain. - for (var attr in this.changed) { - if (this._pending[attr] || this._silent[attr]) continue; - delete this.changed[attr]; - } - this._previousAttributes = _.clone(this.attributes); - } - - this._changing = false; - return this; - }, - - // Determine if the model has changed since the last `"change"` event. - // If you specify an attribute name, determine if that attribute has changed. - hasChanged: function(attr) { - if (!arguments.length) return !_.isEmpty(this.changed); - return _.has(this.changed, attr); - }, - - // Return an object containing all the attributes that have changed, or - // false if there are no changed attributes. Useful for determining what - // parts of a view need to be updated and/or what attributes need to be - // persisted to the server. Unset attributes will be set to undefined. - // You can also pass an attributes object to diff against the model, - // determining if there *would be* a change. - changedAttributes: function(diff) { - if (!diff) return this.hasChanged() ? _.clone(this.changed) : false; - var val, changed = false, old = this._previousAttributes; - for (var attr in diff) { - if (_.isEqual(old[attr], (val = diff[attr]))) continue; - (changed || (changed = {}))[attr] = val; - } - return changed; - }, - - // Get the previous value of an attribute, recorded at the time the last - // `"change"` event was fired. - previous: function(attr) { - if (!arguments.length || !this._previousAttributes) return null; - return this._previousAttributes[attr]; - }, - - // Get all of the attributes of the model at the time of the previous - // `"change"` event. - previousAttributes: function() { - return _.clone(this._previousAttributes); - }, - - // Check if the model is currently in a valid state. It's only possible to - // get into an *invalid* state if you're using silent changes. - isValid: function() { - return !this.validate(this.attributes); - }, - - // Run validation against the next complete set of model attributes, - // returning `true` if all is well. If a specific `error` callback has - // been passed, call that instead of firing the general `"error"` event. - _validate: function(attrs, options) { - if (options.silent || !this.validate) return true; - attrs = _.extend({}, this.attributes, attrs); - var error = this.validate(attrs, options); - if (!error) return true; - if (options && options.error) { - options.error(this, error, options); - } else { - this.trigger('error', this, error, options); - } - return false; - } - - }); - - // Backbone.Collection - // ------------------- - - // Provides a standard collection class for our sets of models, ordered - // or unordered. If a `comparator` is specified, the Collection will maintain - // its models in sort order, as they're added and removed. - var Collection = Backbone.Collection = function(models, options) { - options || (options = {}); - if (options.model) this.model = options.model; - if (options.comparator) this.comparator = options.comparator; - this._reset(); - this.initialize.apply(this, arguments); - if (models) this.reset(models, {silent: true, parse: options.parse}); - }; - - // Define the Collection's inheritable methods. - _.extend(Collection.prototype, Events, { - - // The default model for a collection is just a **Backbone.Model**. - // This should be overridden in most cases. - model: Model, - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // The JSON representation of a Collection is an array of the - // models' attributes. - toJSON: function(options) { - return this.map(function(model){ return model.toJSON(options); }); - }, - - // Add a model, or list of models to the set. Pass **silent** to avoid - // firing the `add` event for every new model. - add: function(models, options) { - var i, index, length, model, cid, id, cids = {}, ids = {}, dups = []; - options || (options = {}); - models = _.isArray(models) ? models.slice() : [models]; - - // Begin by turning bare objects into model references, and preventing - // invalid models or duplicate models from being added. - for (i = 0, length = models.length; i < length; i++) { - if (!(model = models[i] = this._prepareModel(models[i], options))) { - throw new Error("Can't add an invalid model to a collection"); - } - cid = model.cid; - id = model.id; - if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) { - dups.push(i); - continue; - } - cids[cid] = ids[id] = model; - } - - // Remove duplicates. - i = dups.length; - while (i--) { - models.splice(dups[i], 1); - } - - // Listen to added models' events, and index models for lookup by - // `id` and by `cid`. - for (i = 0, length = models.length; i < length; i++) { - (model = models[i]).on('all', this._onModelEvent, this); - this._byCid[model.cid] = model; - if (model.id != null) this._byId[model.id] = model; - } - - // Insert models into the collection, re-sorting if needed, and triggering - // `add` events unless silenced. - this.length += length; - index = options.at != null ? options.at : this.models.length; - splice.apply(this.models, [index, 0].concat(models)); - if (this.comparator) this.sort({silent: true}); - if (options.silent) return this; - for (i = 0, length = this.models.length; i < length; i++) { - if (!cids[(model = this.models[i]).cid]) continue; - options.index = i; - model.trigger('add', model, this, options); - } - return this; - }, - - // Remove a model, or a list of models from the set. Pass silent to avoid - // firing the `remove` event for every model removed. - remove: function(models, options) { - var i, l, index, model; - options || (options = {}); - models = _.isArray(models) ? models.slice() : [models]; - for (i = 0, l = models.length; i < l; i++) { - model = this.getByCid(models[i]) || this.get(models[i]); - if (!model) continue; - delete this._byId[model.id]; - delete this._byCid[model.cid]; - index = this.indexOf(model); - this.models.splice(index, 1); - this.length--; - if (!options.silent) { - options.index = index; - model.trigger('remove', model, this, options); - } - this._removeReference(model); - } - return this; - }, - - // Add a model to the end of the collection. - push: function(model, options) { - model = this._prepareModel(model, options); - this.add(model, options); - return model; - }, - - // Remove a model from the end of the collection. - pop: function(options) { - var model = this.at(this.length - 1); - this.remove(model, options); - return model; - }, - - // Add a model to the beginning of the collection. - unshift: function(model, options) { - model = this._prepareModel(model, options); - this.add(model, _.extend({at: 0}, options)); - return model; - }, - - // Remove a model from the beginning of the collection. - shift: function(options) { - var model = this.at(0); - this.remove(model, options); - return model; - }, - - // Get a model from the set by id. - get: function(id) { - if (id == null) return void 0; - return this._byId[id.id != null ? id.id : id]; - }, - - // Get a model from the set by client id. - getByCid: function(cid) { - return cid && this._byCid[cid.cid || cid]; - }, - - // Get the model at the given index. - at: function(index) { - return this.models[index]; - }, - - // Return models with matching attributes. Useful for simple cases of `filter`. - where: function(attrs) { - if (_.isEmpty(attrs)) return []; - return this.filter(function(model) { - for (var key in attrs) { - if (attrs[key] !== model.get(key)) return false; - } - return true; - }); - }, - - // Force the collection to re-sort itself. You don't need to call this under - // normal circumstances, as the set will maintain sort order as each item - // is added. - sort: function(options) { - options || (options = {}); - if (!this.comparator) throw new Error('Cannot sort a set without a comparator'); - var boundComparator = _.bind(this.comparator, this); - if (this.comparator.length == 1) { - this.models = this.sortBy(boundComparator); - } else { - this.models.sort(boundComparator); - } - if (!options.silent) this.trigger('reset', this, options); - return this; - }, - - // Pluck an attribute from each model in the collection. - pluck: function(attr) { - return _.map(this.models, function(model){ return model.get(attr); }); - }, - - // When you have more items than you want to add or remove individually, - // you can reset the entire set with a new list of models, without firing - // any `add` or `remove` events. Fires `reset` when finished. - reset: function(models, options) { - models || (models = []); - options || (options = {}); - for (var i = 0, l = this.models.length; i < l; i++) { - this._removeReference(this.models[i]); - } - this._reset(); - this.add(models, _.extend({silent: true}, options)); - if (!options.silent) this.trigger('reset', this, options); - return this; - }, - - // Fetch the default set of models for this collection, resetting the - // collection when they arrive. If `add: true` is passed, appends the - // models to the collection instead of resetting. - fetch: function(options) { - options = options ? _.clone(options) : {}; - if (options.parse === undefined) options.parse = true; - var collection = this; - var success = options.success; - options.success = function(resp, status, xhr) { - collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options); - if (success) success(collection, resp); - }; - options.error = Backbone.wrapError(options.error, collection, options); - return (this.sync || Backbone.sync).call(this, 'read', this, options); - }, - - // Create a new instance of a model in this collection. Add the model to the - // collection immediately, unless `wait: true` is passed, in which case we - // wait for the server to agree. - create: function(model, options) { - var coll = this; - options = options ? _.clone(options) : {}; - model = this._prepareModel(model, options); - if (!model) return false; - if (!options.wait) coll.add(model, options); - var success = options.success; - options.success = function(nextModel, resp, xhr) { - if (options.wait) coll.add(nextModel, options); - if (success) { - success(nextModel, resp); - } else { - nextModel.trigger('sync', model, resp, options); - } - }; - model.save(null, options); - return model; - }, - - // **parse** converts a response into a list of models to be added to the - // collection. The default implementation is just to pass it through. - parse: function(resp, xhr) { - return resp; - }, - - // Proxy to _'s chain. Can't be proxied the same way the rest of the - // underscore methods are proxied because it relies on the underscore - // constructor. - chain: function () { - return _(this.models).chain(); - }, - - // Reset all internal state. Called when the collection is reset. - _reset: function(options) { - this.length = 0; - this.models = []; - this._byId = {}; - this._byCid = {}; - }, - - // Prepare a model or hash of attributes to be added to this collection. - _prepareModel: function(model, options) { - options || (options = {}); - if (!(model instanceof Model)) { - var attrs = model; - options.collection = this; - model = new this.model(attrs, options); - if (!model._validate(model.attributes, options)) model = false; - } else if (!model.collection) { - model.collection = this; - } - return model; - }, - - // Internal method to remove a model's ties to a collection. - _removeReference: function(model) { - if (this == model.collection) { - delete model.collection; - } - model.off('all', this._onModelEvent, this); - }, - - // Internal method called every time a model in the set fires an event. - // Sets need to update their indexes when models change ids. All other - // events simply proxy through. "add" and "remove" events that originate - // in other collections are ignored. - _onModelEvent: function(event, model, collection, options) { - if ((event == 'add' || event == 'remove') && collection != this) return; - if (event == 'destroy') { - this.remove(model, options); - } - if (model && event === 'change:' + model.idAttribute) { - delete this._byId[model.previous(model.idAttribute)]; - this._byId[model.id] = model; - } - this.trigger.apply(this, arguments); - } - - }); - - // Underscore methods that we want to implement on the Collection. - var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find', - 'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any', - 'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex', - 'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf', - 'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy']; - - // Mix in each Underscore method as a proxy to `Collection#models`. - _.each(methods, function(method) { - Collection.prototype[method] = function() { - return _[method].apply(_, [this.models].concat(_.toArray(arguments))); - }; - }); - - // Backbone.Router - // ------------------- - - // Routers map faux-URLs to actions, and fire events when routes are - // matched. Creating a new one sets its `routes` hash, if not set statically. - var Router = Backbone.Router = function(options) { - options || (options = {}); - if (options.routes) this.routes = options.routes; - this._bindRoutes(); - this.initialize.apply(this, arguments); - }; - - // Cached regular expressions for matching named param parts and splatted - // parts of route strings. - var namedParam = /:\w+/g; - var splatParam = /\*\w+/g; - var escapeRegExp = /[-[\]{}()+?.,\\^$|#\s]/g; - - // Set up all inheritable **Backbone.Router** properties and methods. - _.extend(Router.prototype, Events, { - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // Manually bind a single named route to a callback. For example: - // - // this.route('search/:query/p:num', 'search', function(query, num) { - // ... - // }); - // - route: function(route, name, callback) { - Backbone.history || (Backbone.history = new History); - if (!_.isRegExp(route)) route = this._routeToRegExp(route); - if (!callback) callback = this[name]; - Backbone.history.route(route, _.bind(function(fragment) { - var args = this._extractParameters(route, fragment); - callback && callback.apply(this, args); - this.trigger.apply(this, ['route:' + name].concat(args)); - Backbone.history.trigger('route', this, name, args); - }, this)); - return this; - }, - - // Simple proxy to `Backbone.history` to save a fragment into the history. - navigate: function(fragment, options) { - Backbone.history.navigate(fragment, options); - }, - - // Bind all defined routes to `Backbone.history`. We have to reverse the - // order of the routes here to support behavior where the most general - // routes can be defined at the bottom of the route map. - _bindRoutes: function() { - if (!this.routes) return; - var routes = []; - for (var route in this.routes) { - routes.unshift([route, this.routes[route]]); - } - for (var i = 0, l = routes.length; i < l; i++) { - this.route(routes[i][0], routes[i][1], this[routes[i][1]]); - } - }, - - // Convert a route string into a regular expression, suitable for matching - // against the current location hash. - _routeToRegExp: function(route) { - route = route.replace(escapeRegExp, '\\$&') - .replace(namedParam, '([^\/]+)') - .replace(splatParam, '(.*?)'); - return new RegExp('^' + route + '$'); - }, - - // Given a route, and a URL fragment that it matches, return the array of - // extracted parameters. - _extractParameters: function(route, fragment) { - return route.exec(fragment).slice(1); - } - - }); - - // Backbone.History - // ---------------- - - // Handles cross-browser history management, based on URL fragments. If the - // browser does not support `onhashchange`, falls back to polling. - var History = Backbone.History = function() { - this.handlers = []; - _.bindAll(this, 'checkUrl'); - }; - - // Cached regex for cleaning leading hashes and slashes . - var routeStripper = /^[#\/]/; - - // Cached regex for detecting MSIE. - var isExplorer = /msie [\w.]+/; - - // Has the history handling already been started? - History.started = false; - - // Set up all inheritable **Backbone.History** properties and methods. - _.extend(History.prototype, Events, { - - // The default interval to poll for hash changes, if necessary, is - // twenty times a second. - interval: 50, - - // Gets the true hash value. Cannot use location.hash directly due to bug - // in Firefox where location.hash will always be decoded. - getHash: function(windowOverride) { - var loc = windowOverride ? windowOverride.location : window.location; - var match = loc.href.match(/#(.*)$/); - return match ? match[1] : ''; - }, - - // Get the cross-browser normalized URL fragment, either from the URL, - // the hash, or the override. - getFragment: function(fragment, forcePushState) { - if (fragment == null) { - if (this._hasPushState || forcePushState) { - fragment = window.location.pathname; - var search = window.location.search; - if (search) fragment += search; - } else { - fragment = this.getHash(); - } - } - if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length); - return fragment.replace(routeStripper, ''); - }, - - // Start the hash change handling, returning `true` if the current URL matches - // an existing route, and `false` otherwise. - start: function(options) { - if (History.started) throw new Error("Backbone.history has already been started"); - History.started = true; - - // Figure out the initial configuration. Do we need an iframe? - // Is pushState desired ... is it available? - this.options = _.extend({}, {root: '/'}, this.options, options); - this._wantsHashChange = this.options.hashChange !== false; - this._wantsPushState = !!this.options.pushState; - this._hasPushState = !!(this.options.pushState && window.history && window.history.pushState); - var fragment = this.getFragment(); - var docMode = document.documentMode; - var oldIE = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7)); - - if (oldIE) { - this.iframe = $('