parent
0df0926739
commit
3c370ea56e
8 changed files with 4 additions and 117 deletions
|
|
@ -10,6 +10,7 @@
|
||||||
* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
|
* 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)
|
* 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)
|
* 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
|
## Bug fixes
|
||||||
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
|
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ app.views.Hovercard = app.views.Base.extend({
|
||||||
// cache some element references
|
// cache some element references
|
||||||
this.avatar = this.$('.avatar');
|
this.avatar = this.$('.avatar');
|
||||||
this.avatarLink = this.$("a.person_avatar");
|
this.avatarLink = this.$("a.person_avatar");
|
||||||
this.dropdown = this.$('.dropdown_list');
|
|
||||||
this.dropdown_container = this.$('#hovercard_dropdown_container');
|
this.dropdown_container = this.$('#hovercard_dropdown_container');
|
||||||
this.hashtags = this.$('.hashtags');
|
this.hashtags = this.$('.hashtags');
|
||||||
this.person_link = this.$('a.person');
|
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.attr('href', person.url);
|
||||||
this.person_link.text(person.name);
|
this.person_link.text(person.name);
|
||||||
this.person_handle.text(person.handle);
|
this.person_handle.text(person.handle);
|
||||||
this.dropdown.attr('data-person-id', person.id);
|
|
||||||
|
|
||||||
// set hashtags
|
// set hashtags
|
||||||
this.hashtags.empty();
|
this.hashtags.empty();
|
||||||
|
|
|
||||||
|
|
@ -91,11 +91,6 @@
|
||||||
Diaspora.page.publish("page/ready", [$(document.body)]);
|
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;
|
window.Diaspora = Diaspora;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
|
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
|
||||||
var View = {
|
var View = {
|
||||||
initialize: function() {
|
initialize: function() {
|
||||||
/* Buttons */
|
|
||||||
$("input:submit").addClass("button");
|
|
||||||
|
|
||||||
/* label placeholders */
|
/* label placeholders */
|
||||||
$("input, textarea").placeholder();
|
$("input, textarea").placeholder();
|
||||||
|
|
||||||
|
|
@ -15,11 +12,6 @@ var View = {
|
||||||
/* Submit the form when the user hits enter */
|
/* Submit the form when the user hits enter */
|
||||||
.keypress(this.search.keyPress);
|
.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 () {
|
$(document).on('ajax:success', 'form[data-remote]', function () {
|
||||||
$(this).clearForm();
|
$(this).clearForm();
|
||||||
$(this).focusout();
|
$(this).focusout();
|
||||||
|
|
@ -30,30 +22,13 @@ var View = {
|
||||||
$(this).siblings("#tag_following_submit").removeClass('hidden');
|
$(this).siblings("#tag_following_submit").removeClass('hidden');
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document.body).click(this.dropdowns.removeFocus);
|
|
||||||
|
|
||||||
$('a[rel*=facebox]').facebox();
|
$('a[rel*=facebox]').facebox();
|
||||||
$(document).bind('reveal.facebox', function() {
|
$(document).bind('reveal.facebox', function() {
|
||||||
Diaspora.page.directionDetector.updateBinds();
|
Diaspora.page.directionDetector.updateBinds();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("a.new_aspect").click(function(){
|
|
||||||
$("input#aspect_name").focus();
|
|
||||||
});
|
|
||||||
|
|
||||||
/* facebox 'done' buttons */
|
/* facebox 'done' buttons */
|
||||||
$(document).on('click', "*[rel*=close]", function(){ $.facebox.close(); });
|
$(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: {
|
search: {
|
||||||
|
|
@ -65,21 +40,6 @@ var View = {
|
||||||
},
|
},
|
||||||
selector: "#q"
|
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() {
|
$(function() {
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
||||||
|
|
@ -943,37 +943,6 @@ form p.checkbox_select {
|
||||||
padding-left: 120px;
|
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 {
|
#settings_nav {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@
|
||||||
%p
|
%p
|
||||||
= t('aspects.index.help.contact_podmin')
|
= t('aspects.index.help.contact_podmin')
|
||||||
%p
|
%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
|
.section
|
||||||
.title
|
.title
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ module UserCukeHelpers
|
||||||
|
|
||||||
# submit forgot password form to get reset password link
|
# submit forgot password form to get reset password link
|
||||||
def submit_forgot_password_form
|
def submit_forgot_password_form
|
||||||
find("#new_user input.button").click
|
find("#new_user input.btn").click
|
||||||
end
|
end
|
||||||
|
|
||||||
# fill the reset password form
|
# fill the reset password form
|
||||||
|
|
@ -101,7 +101,7 @@ module UserCukeHelpers
|
||||||
|
|
||||||
# submit reset password form
|
# submit reset password form
|
||||||
def submit_reset_password_form
|
def submit_reset_password_form
|
||||||
find(".button").click
|
find(".btn").click
|
||||||
end
|
end
|
||||||
|
|
||||||
def confirm_not_signed_up
|
def confirm_not_signed_up
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue