diff --git a/Changelog.md b/Changelog.md index 44aba5be2..78b660f77 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ ## Refactor +* Delete unnecessary javascript views. [#4059] (https://github.com/diaspora/diaspora/pull/4059) * Add a configuration entry to set max-age header to Amazon S3 resources. [#4048](https://github.com/diaspora/diaspora/pull/4048) * Refactor people_controller#show and photos_controller#index [#4002](https://github.com/diaspora/diaspora/issues/4002) * Modularize layout [#3944](https://github.com/diaspora/diaspora/pull/3944) diff --git a/app/assets/javascripts/app/views/profile_info_view.js b/app/assets/javascripts/app/views/profile_info_view.js deleted file mode 100644 index ccba39a54..000000000 --- a/app/assets/javascripts/app/views/profile_info_view.js +++ /dev/null @@ -1,9 +0,0 @@ -app.views.ProfileInfo = app.views.Base.extend({ - templateName : "profile-info", - - tooltipSelector : "*[rel=tooltip]", - - initialize : function(){ - this.model.bind("change", this.render, this) - } -}); \ No newline at end of file diff --git a/app/assets/javascripts/app/views/services_selector_view.js b/app/assets/javascripts/app/views/services_selector_view.js deleted file mode 100644 index 43cb65328..000000000 --- a/app/assets/javascripts/app/views/services_selector_view.js +++ /dev/null @@ -1,39 +0,0 @@ -app.views.ServicesSelector = app.views.Base.extend({ - - templateName : "services-selector", - - events : { - "click label" : "askForAuth" - }, - - tooltipSelector : "img", - - services : [ - 'facebook', - 'twitter', - 'tumblr' - ], - - presenter : function() { - var selectedServices = this.model.get('services'); - - return _.extend(this.defaultPresenter(), { - services :_.map(this.services, function(service){ - return { - name : service, - checked :_.include(selectedServices, service) - } - }) - }) - }, - - askForAuth : function(evt){ - var $target = $(evt.target); - - if(app.currentUser.isServiceConfigured($target.data('provider'))) { return } - - var serviceUrl = $target.data('url') - window.open(serviceUrl, 'popup', 'height=400,width=500') - } - -}); diff --git a/app/assets/templates/profile-info_tpl.jst.hbs b/app/assets/templates/profile-info_tpl.jst.hbs deleted file mode 100644 index d914fa9b0..000000000 --- a/app/assets/templates/profile-info_tpl.jst.hbs +++ /dev/null @@ -1,55 +0,0 @@ -
-
-

- {{name}} -

- -
- {{#if location}} - - - - - {{location}} - - • - {{/if}} - - {{#if birthday}} - - - {{birthday}} - - • - {{/if}} - - - - - - - - - - - - - - {{#if is_own_profile}} - - • - - - - - - {{/if}} -
- -
-

- {{bio}} -

-
-
- diff --git a/app/assets/templates/services-selector_tpl.jst.hbs b/app/assets/templates/services-selector_tpl.jst.hbs deleted file mode 100644 index eaec5629f..000000000 --- a/app/assets/templates/services-selector_tpl.jst.hbs +++ /dev/null @@ -1,9 +0,0 @@ - -
- {{#each services}} - - - {{/each}} -
diff --git a/spec/javascripts/app/views/services_selector_view_spec.js b/spec/javascripts/app/views/services_selector_view_spec.js deleted file mode 100644 index 2857825d2..000000000 --- a/spec/javascripts/app/views/services_selector_view_spec.js +++ /dev/null @@ -1,53 +0,0 @@ -describe("app.views.ServicesSelector", function(){ - beforeEach(function(){ - loginAs({ - services : [ - { provider : "facebook" } - ] - }); - - this.view = new app.views.ServicesSelector({model : factory.statusMessage()}); - }); - - describe("rendering", function(){ - beforeEach(function(){ - this.view.setElement("#jasmine_content") - this.view.render(); - }); - - it("displays all services", function(){ - var checkboxes = $(this.view.el).find('input[type="checkbox"]'); - expect(checkboxes.val()).toBe("facebook"); - }); - - // this tests the crazy css we have in a bassackwards way - // check out toggling the services on the new publisher and make sure it works if you change stuff. - it("selects the checkbox when the image is clicked", function(){ - expect($("label[for='services[facebook]'] img").is(".magic-service-selector input:not(:checked) + label img")).toBeTruthy(); - this.view.$("input[value='facebook']").select() - - expect($("label[for='services[facebook]'] img").is(".magic-service-selector input:not(:checked) + label img")).toBeFalsy(); - }); - }); - - describe("askForAuth", function() { - beforeEach( function(){ - this.evt = jQuery.Event("click"); - this.evt.target = "