nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6348 from diaspora/6279-backport

Browse source 
6279 backport
This commit is contained in:
Dennis Schubert 2015-08-26 23:08:28 +02:00
commit 7bd1795855
8 changed files with 4 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -10,6 +10,7 @@
* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
* Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
* Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
* Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279)
## Bug fixes
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)

2
app/assets/javascripts/app/views/hovercard_view.js
View file

@ -21,7 +21,6 @@ app.views.Hovercard = app.views.Base.extend({
// cache some element references
this.avatar = this.$('.avatar');
this.avatarLink = this.$("a.person_avatar");
this.dropdown = this.$('.dropdown_list');
this.dropdown_container = this.$('#hovercard_dropdown_container');
this.hashtags = this.$('.hashtags');
this.person_link = this.$('a.person');
@ -120,7 +119,6 @@ app.views.Hovercard = app.views.Base.extend({
this.person_link.attr('href', person.url);
this.person_link.text(person.name);
this.person_handle.text(person.handle);
this.dropdown.attr('data-person-id', person.id);
// set hashtags
this.hashtags.empty();

5
app/assets/javascripts/diaspora.js
View file

@ -91,11 +91,6 @@
Diaspora.page.publish("page/ready", [$(document.body)]);
};
// temp hack to check if backbone is enabled for the page
Diaspora.backboneEnabled = function(){
return window.app && window.app.stream !== undefined;
};
window.Diaspora = Diaspora;
})();

40
app/assets/javascripts/view.js
View file

@ -1,9 +1,6 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
var View = {
initialize: function() {
/* Buttons */
$("input:submit").addClass("button");
/* label placeholders */
$("input, textarea").placeholder();
@ -15,11 +12,6 @@ var View = {
/* Submit the form when the user hits enter */
.keypress(this.search.keyPress);
/* Dropdowns */
$(document)
.on('click', this.dropdowns.selector, this.dropdowns.click)
.on('keypress', this.dropdowns.selector, this.dropdowns.click);
$(document).on('ajax:success', 'form[data-remote]', function () {
$(this).clearForm();
$(this).focusout();
@ -30,30 +22,13 @@ var View = {
$(this).siblings("#tag_following_submit").removeClass('hidden');
});
$(document.body).click(this.dropdowns.removeFocus);
$('a[rel*=facebox]').facebox();
$(document).bind('reveal.facebox', function() {
Diaspora.page.directionDetector.updateBinds();
});
$("a.new_aspect").click(function(){
$("input#aspect_name").focus();
});
/* facebox 'done' buttons */
$(document).on('click', "*[rel*=close]", function(){ $.facebox.close(); });
/* notification routing */
$("#notification").delegate('.hard_object_link', 'click', function(evt){
var post = $("#"+ $(this).attr('data-ref')),
lastComment = post.find('.comment.posted').last();
if(post.length > 0){
evt.preventDefault();
$('html, body').animate({scrollTop: parseInt(lastComment.offset().top)-80 }, 'fast');
}
});
},
search: {
@ -65,21 +40,6 @@ var View = {
},
selector: "#q"
},
dropdowns: {
click: function(evt) {
$(this).parent('.dropdown').toggleClass("active");
evt.preventDefault();
},
removeFocus: function(evt) {
var $target = $(evt.target);
if(!$target.is('.dropdown_list *') && !$target.is('.dropdown.active > .toggle')) {
$(View.dropdowns.selector).parent().removeClass("active");
}
},
selector: ".dropdown > .toggle",
parentSelector: ".dropdown > .wrapper"
}
};
$(function() {

36
app/assets/javascripts/widgets/stream.js
View file

@ -1,36 +0,0 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
(function() {
var Stream = function() {
var self = this;
this.subscribe("widget/ready", function(evt, stream) {
if( Diaspora.backboneEnabled() ){ return }
$.extend(self, {
stream: $(stream),
mainStream: $(stream).find('#main_stream'),
headerTitle: $(stream).find('#aspect_stream_header > h3')
});
});
this.globalSubscribe("stream/reloaded stream/scrolled", function() {
self.publish("widget/ready", self.stream);
});
this.empty = function() {
self.mainStream.empty();
self.headerTitle.text(Diaspora.I18n.t('stream.no_aspects'));
};
this.setHeaderTitle = function(newTitle) {
self.headerTitle.text(newTitle);
};
};
if(!Diaspora.backboneEnabled()) {
Diaspora.Widgets.Stream = Stream;
}
})();
// @license-end

31
app/assets/stylesheets/mobile/mobile.scss
View file

@ -943,37 +943,6 @@ form p.checkbox_select {
padding-left: 120px;
}
#file-upload.button {
@include button-gradient($light-grey);
border-radius: 3px;
box-shadow: 0 1px 1px #cfcfcf;
@include transition(border);
display: inline-block;
font {
style: normal;
size: 12px;
}
color: #505050;
padding: 4px 9px;
min-height: 10px;
border: 1px solid;
cursor: pointer;
white-space: normal;
&:hover {
@include button-gradient-hover-no-saturation($light-grey);
color: #505050;
text-decoration: none;
border: 1px solid;
}
}
#settings_nav {
font-size: 1em;

2
app/views/shared/_right_sections.html.haml
View file

@ -90,7 +90,7 @@
%p
= t('aspects.index.help.contact_podmin')
%p
= link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
= link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
.section
.title

4
features/support/user_cuke_helpers.rb
View file

@ -90,7 +90,7 @@ module UserCukeHelpers
# submit forgot password form to get reset password link
def submit_forgot_password_form
find("#new_user input.button").click
find("#new_user input.btn").click
end
# fill the reset password form
@ -101,7 +101,7 @@ module UserCukeHelpers
# submit reset password form
def submit_reset_password_form
find(".button").click
find(".btn").click
end
def confirm_not_signed_up