diff --git a/Changelog.md b/Changelog.md
index a93d4a04f..61b79b5b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -25,6 +25,8 @@
## Bug fixes
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
+* Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
+* Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
## Features
* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/assets/javascripts/app/models/person.js b/app/assets/javascripts/app/models/person.js
index 4d70fada4..0f548798b 100644
--- a/app/assets/javascripts/app/models/person.js
+++ b/app/assets/javascripts/app/models/person.js
@@ -30,7 +30,7 @@ app.models.Person = Backbone.Model.extend({
},
isBlocked: function() {
- return (this.get('relationship') === 'blocked');
+ return (this.get("block") !== false);
},
block: function() {
diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js
index 485fca01c..7027ea97c 100644
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -10,7 +10,6 @@ app.views.Content = app.views.Base.extend({
text : app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people")),
largePhoto : this.largePhoto(),
smallPhotos : this.smallPhotos(),
- location: this.location(),
isReshare : this.model.get("post_type") === "Reshare"
});
},
@@ -38,11 +37,6 @@ app.views.Content = app.views.Base.extend({
$(evt.currentTarget).hide();
},
- location: function(){
- var location = this.model.get("location")? this.model.get("location") : "";
- return location;
- },
-
collapseOversized : function() {
var collHeight = 200
, elem = this.$(".collapsible")
diff --git a/app/assets/javascripts/app/views/location_stream.js b/app/assets/javascripts/app/views/location_stream.js
index 925ee1f2f..8b3238c30 100644
--- a/app/assets/javascripts/app/views/location_stream.js
+++ b/app/assets/javascripts/app/views/location_stream.js
@@ -1,6 +1,6 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-app.views.LocationStream = app.views.Content.extend({
+app.views.LocationStream = app.views.Base.extend({
events: {
"click .near-from": "toggleMap"
},
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 87f9d1cba..6acfa971d 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -11,7 +11,6 @@
//= require jquery-placeholder
//= require rails-timeago
//= require jquery.events.input
-//= require jquery.infinitescroll-custom
//= require jquery-ui/core
//= require jquery-ui/widget
//= require jquery-ui/mouse
diff --git a/app/presenters/person_presenter.rb b/app/presenters/person_presenter.rb
index 8149acbc1..1c1cc88a0 100644
--- a/app/presenters/person_presenter.rb
+++ b/app/presenters/person_presenter.rb
@@ -52,7 +52,6 @@ class PersonPresenter < BasePresenter
def relationship
return false unless current_user
- return :blocked if is_blocked?
contact = current_user_person_contact
return :not_sharing unless contact
diff --git a/app/views/conversations/_new.haml b/app/views/conversations/_new.haml
index c84a6b95a..17eaed4af 100644
--- a/app/views/conversations/_new.haml
+++ b/app/views/conversations/_new.haml
@@ -4,7 +4,12 @@
.form-group
%label#to-label{for: "contacts-search-input"}= t(".to")
.recipients-tag-list.clearfix#recipients-tag-list
- = text_field_tag "contact_autocomplete", nil, id: "contacts-search-input", class: "form-control"
+ = text_field_tag "contact_autocomplete",
+ nil,
+ id: "contacts-search-input",
+ class: "form-control",
+ autocomplete: "off"
+
- unless defined?(mobile) && mobile
= text_field_tag "person_ids", nil, id: "contact-ids", type: "hidden",
aria: {labelledby: "to-label"}
diff --git a/spec/javascripts/app/models/person_spec.js b/spec/javascripts/app/models/person_spec.js
index d84afdd8f..c4b873832 100644
--- a/spec/javascripts/app/models/person_spec.js
+++ b/spec/javascripts/app/models/person_spec.js
@@ -4,7 +4,7 @@ describe("app.models.Person", function() {
this.mutualContact = factory.person({relationship: "mutual"});
this.sharingContact = factory.person({relationship: "sharing"});
this.receivingContact = factory.person({relationship: "receiving"});
- this.blockedContact = factory.person({relationship: "blocked", block: {id: 1}});
+ this.blockedContact = factory.person({relationship: "sharing", block: {id: 1}});
});
describe("initialize", function() {
@@ -20,9 +20,9 @@ describe("app.models.Person", function() {
it("indicates if the person is sharing", function() {
expect(this.mutualContact.isSharing()).toBeTruthy();
expect(this.sharingContact.isSharing()).toBeTruthy();
+ expect(this.blockedContact.isSharing()).toBeTruthy();
expect(this.receivingContact.isSharing()).toBeFalsy();
- expect(this.blockedContact.isSharing()).toBeFalsy();
});
});
diff --git a/spec/javascripts/jasmine_helpers/factory.js b/spec/javascripts/jasmine_helpers/factory.js
index 7732e8281..551fe87bc 100644
--- a/spec/javascripts/jasmine_helpers/factory.js
+++ b/spec/javascripts/jasmine_helpers/factory.js
@@ -153,6 +153,7 @@ var factory = {
"name": "Bob Grimm",
"diaspora_id": "bob@localhost:3000",
"relationship": "sharing",
+ "block": false,
"is_own_profile": false
};
return _.extend({}, defaults, overrides);
diff --git a/spec/presenters/person_presenter_spec.rb b/spec/presenters/person_presenter_spec.rb
index e6c224674..c21965f9b 100644
--- a/spec/presenters/person_presenter_spec.rb
+++ b/spec/presenters/person_presenter_spec.rb
@@ -92,12 +92,6 @@ describe PersonPresenter do
end
context "relationship" do
- it "is blocked?" do
- allow(current_user).to receive(:block_for) { double(id: 1) }
- allow(current_user).to receive(:contact_for) { non_contact }
- expect(@p.full_hash[:relationship]).to be(:blocked)
- end
-
it "is mutual?" do
allow(current_user).to receive(:contact_for) { mutual_contact }
expect(@p.full_hash[:relationship]).to be(:mutual)
@@ -118,6 +112,19 @@ describe PersonPresenter do
expect(@p.full_hash[:relationship]).to be(:not_sharing)
end
end
+
+ describe "block" do
+ it "contains the block id if it exists" do
+ allow(current_user).to receive(:contact_for) { non_contact }
+ allow(current_user).to receive(:block_for) { double(id: 1) }
+ expect(@p.full_hash[:block][:id]).to be(1)
+ end
+
+ it "is false if no block is present" do
+ allow(current_user).to receive(:contact_for) { non_contact }
+ expect(@p.full_hash[:block]).to be(false)
+ end
+ end
end
describe "#hovercard" do
diff --git a/vendor/assets/javascripts/jquery.infinitescroll-custom.js b/vendor/assets/javascripts/jquery.infinitescroll-custom.js
deleted file mode 100644
index d9f521892..000000000
--- a/vendor/assets/javascripts/jquery.infinitescroll-custom.js
+++ /dev/null
@@ -1,621 +0,0 @@
-/*!
-// Infinite Scroll jQuery plugin
-// copyright Paul Irish, licensed GPL & MIT
-// version 2.0b1.110420
-
-// home and docs: http://www.infinite-scroll.com
-// Modified by Diaspora:
-// A few callbacks were made options and generateInstanceID was make jquery 162 compatible
-*/
-
-; (function ($) {
-
- /* Define 'infinitescroll' function
- ---------------------------------------------------*/
-
- $.fn.infinitescroll = function infscr(options, callback) {
-
- // grab each selector option and see if any fail.
- function areSelectorsValid(opts) {
- var debug = $.fn.infinitescroll._debug;
- for (var key in opts) {
- if (key.indexOf && key.indexOf('Selector') > -1 && $(opts[key]).length === 0) {
- debug('Your ' + key + ' found no elements.');
- return false;
- }
- return true;
- }
- }
-
-
- // find the number to increment in the path.
- function determinePath(path) {
-
- if ($.isFunction(opts.pathParse)) {
-
- debug('pathParse');
- return [path];
-
- } else if (path.match(/^(.*?)\b2\b(.*?$)/)) {
- path = path.match(/^(.*?)\b2\b(.*?$)/).slice(1);
-
- // if there is any 2 in the url at all.
- } else if (path.match(/^(.*?)2(.*?$)/)) {
-
- // page= is used in django:
- // http://www.infinite-scroll.com/changelog/comment-page-1/#comment-127
- if (path.match(/^(.*?page=)2(\/.*|$)/)) {
- path = path.match(/^(.*?page=)2(\/.*|$)/).slice(1);
- return path;
- }
-
- path = path.match(/^(.*?)2(.*?$)/).slice(1);
-
- } else {
-
- // page= is used in drupal too but second page is page=1 not page=2:
- // thx Jerod Fritz, vladikoff
- if (path.match(/^(.*?page=)1(\/.*|$)/)) {
- path = path.match(/^(.*?page=)1(\/.*|$)/).slice(1);
- return path;
- } else {
- debug('Sorry, we couldn\'t parse your Next (Previous Posts) URL. Verify your the css selector points to the correct A tag. If you still get this error: yell, scream, and kindly ask for help at infinite-scroll.com.');
- props.isInvalidPage = true; //prevent it from running on this page.
- }
- }
- debug('determinePath',path);
- return path;
- }
-
-
- // Calculate internal height (used for local scroll)
- function hiddenHeight(element) {
- var height = 0;
- $(element).children().each(function () {
- height = height + $(this).outerHeight(false);
- });
- return height;
- }
-
-
- //Generate InstanceID based on random data (to give consistent but different ID's)
- function generateInstanceID(element) {
- var $element = $(element)
- var number = $element.length + $element.html().length
- if($element.attr("class") !== undefined){
- number += $element.attr("class").length
- }
- if($element.attr("id") !== undefined){
- number += $element.attr("id").length
- }
- opts.infid = number;
- }
-
-
- // if options is a string, use as a command
- if (typeof options=='string') {
-
- var command = options,
- argument = callback,
- validCommand = (command == 'pause' || command == 'destroy' || command == 'retrieve' || command == 'binding'),
- debug = $.fn.infinitescroll._debug;
-
- argument = argument || null;
- command = (validCommand) ? $.fn.infinitescroll[command](argument) : debug('Invalid command');
-
- return false;
- }
-
-
- // lets get started.
- var opts = $.infinitescroll.opts = $.extend({}, $.infinitescroll.defaults, options),
- props = $.infinitescroll, // shorthand
- innerContainerHeight, box, frag, desturl, pause, error, errorStatus, method, result;
- callback = $.fn.infinitescroll._callback = callback || function () { },
- debug = $.fn.infinitescroll._debug,
- error = $.fn.infinitescroll._error,
- pause = $.fn.infinitescroll.pause,
- destroy = $.fn.infinitescroll.destroy,
- binding = $.fn.infinitescroll.binding;
-
-
- // if selectors from opts aren't valid, return false
- if (!areSelectorsValid(opts)) { return false; }
-
-
- opts.container = opts.container || document.documentElement;
-
-
- // contentSelector we'll use for our ajax call
- opts.contentSelector = opts.contentSelector || this;
-
- // Generate unique instance ID
- opts.infid = (opts.infid == 0) ? generateInstanceID(opts.contentSelector) : opts.infid;
-
- // loadMsgSelector - if we want to place the load message in a specific selector, defaulted to the contentSelector
- opts.loadMsgSelector = opts.loadMsgSelector || opts.contentSelector;
-
-
- // get the relative URL - everything past the domain name.
- var relurl = /(.*?\/\/).*?(\/.*)/,
- path = $(opts.nextSelector).attr('href');
-
- if (!path) { debug('Navigation selector not found'); return; }
-
- // set the path to be a relative URL from root.
- opts.path = determinePath(path);
-
-
- // define loading msg
- props.loadingMsg = $('
' + opts.loadingText + '
'+data+'
';
- data = $(data).find(opts.itemSelector);
- };
-
- break;
-
- case 'append':
-
- var children = box.children();
-
- // if it didn't return anything
- if (children.length == 0 || children.hasClass('error404')) {
- // trigger a 404 error so we can quit.
- return error([404]);
- }
-
-
- // use a documentFragment because it works when content is going into a table or UL
- frag = document.createDocumentFragment();
- while (box[0].firstChild) {
- frag.appendChild(box[0].firstChild);
- }
-
- $(opts.contentSelector)[0].appendChild(frag);
- // previously, we would pass in the new DOM element as context for the callback
- // however we're now using a documentfragment, which doesnt havent parents or children,
- // so the context is the contentContainer guy, and we pass in an array
- // of the elements collected as the first argument.
-
- data = children.get();
-
-
- break;
-
- }
-
- // fadeout currently makes the 'd text ugly in IE6
- props.loadingMsg.hide();
-
-
- // smooth scroll to ease in the new content
- if (opts.animate) {
- var scrollTo = $(window).scrollTop() + $('#infscr-loading').height() + opts.extraScrollPx + 'px';
- $('html,body').animate({ scrollTop: scrollTo }, 800, function () { opts.isDuringAjax = false; });
- }
-
- if (!opts.animate) opts.isDuringAjax = false; // once the call is done, we can allow it again.
-
- callback.call($(opts.contentSelector)[0], data);
-
- };
-
-
- // Show done message.
- $.fn.infinitescroll._donemsg = function infscr_donemsg() {
-
- // replace with shorthand function
- var props = $.infinitescroll,
- opts = $.infinitescroll.opts;
-
- props.loadingMsg
- .find('img')
- .hide()
- .parent()
- .find('div').html(opts.donetext).animate({ opacity: 1 }, 2000, function () {
- $(this).parent().fadeOut('normal');
- });
-
- // user provided callback when done
- opts.errorCallback();
- }
-
-
- // Pause function
- $.fn.infinitescroll.pause = function infscr_pause(pause) {
-
- // if pauseValue is not 'pause' or 'resume', toggle it's value
- var debug = $.fn.infinitescroll._debug,
- opts = $.infinitescroll.opts;
-
- if (pause !== 'pause' && pause !== 'resume' && pause !== 'toggle' && pause !== null) {
- debug('Invalid argument. Toggling pause value instead');
- };
-
- pause = (pause && (pause == 'pause' || pause == 'resume')) ? pause : 'toggle';
-
- switch (pause) {
- case 'pause':
- opts.isPaused = true;
- break;
-
- case 'resume':
- opts.isPaused = false;
- break;
-
- case 'toggle':
- opts.isPaused = !opts.isPaused;
- break;
- }
-
- debug('Paused',opts.isPaused);
- return false;
- }
-
-
- // Error function
- $.fn.infinitescroll._error = function infscr_error(xhr) {
-
- // replace with shorthand function
- var opts = $.infinitescroll.opts,
- binder = (opts.container.nodeName == "HTML") ? $(window) : $(opts.container),
- debug = $.fn.infinitescroll._debug,
- showDoneMsg = $.fn.infinitescroll._donemsg,
- error = (!opts.isDone && xhr == 404) ? 'end' : (opts.isDestroyed && xhr == 302) ? 'destroy' : 'unknown';
-
- switch (error) {
-
- case 'end':
-
- // die if we're out of pages.
- debug('Page not found. Self-destructing...');
- showDoneMsg();
- opts.isDone = true;
- opts.currPage = 1; // if you need to go back to this instance
- opts.isPaused = false;
- binder.unbind('smartscroll.infscr.' + opts.infid);
-
- break;
-
- case 'destroy':
-
- // die if destroyed.
- debug('Destroyed. Going to next instance...');
- opts.isDone = true;
- opts.currPage = 1; // if you need to go back to this instance
- opts.isPaused = false;
- binder.unbind('smartscroll.infscr.' + opts.infid);
-
- break;
-
- case 'unknown':
-
- // unknown error.
- debug('Unknown Error. WHAT DID YOU DO?!...');
- showDoneMsg();
- opts.isDone = true;
- opts.currPage = 1; // if you need to go back to this instance
- binder.unbind('smartscroll.infscr.' + opts.infid);
-
- break;
-
- }
-
- }
-
-
- // Destroy current instance of the plugin
- $.fn.infinitescroll.destroy = function infscr_destroy() {
-
- // replace with shorthand function
- var opts = $.infinitescroll.opts,
- error = $.fn.infinitescroll._error;
-
- opts.isDestroyed = true;
- return error([302]);
-
- }
-
-
- // Scroll binding + unbinding
- $.fn.infinitescroll.binding = function infscr_binding(binding) {
-
- // replace with shorthand function
- var opts = $.infinitescroll.opts,
- setup = $.fn.infinitescroll._setup,
- error = $.fn.infinitescroll._error,
- debug = $.fn.infinitescroll._debug;
-
- switch(binding) {
-
- case 'bind':
- opts.binder.bind('smartscroll.infscr.'+opts.infid, setup);
- break;
-
- case 'unbind':
- opts.binder.unbind('smartscroll.infscr.'+opts.infid);
- break;
-
- }
-
- debug('Binding',binding);
- return false;
-
- }
-
-
- /*
- * smartscroll: debounced scroll event for jQuery *
- * https://github.com/lukeshumard/smartscroll
- * Based on smartresize by @louis_remi: https://github.com/lrbabe/jquery.smartresize.js *
- * Copyright 2011 Louis-Remi & Luke Shumard * Licensed under the MIT license. *
- */
-
- var event = $.event,
- scrollTimeout;
-
- event.special.smartscroll = {
- setup: function() {
- $(this).bind( "scroll", event.special.smartscroll.handler );
- },
- teardown: function() {
- $(this).unbind( "scroll", event.special.smartscroll.handler );
- },
- handler: function( event, execAsap ) {
- // Save the context
- var context = this,
- args = arguments;
-
- // set correct event type
- event.type = "smartscroll";
-
- if (scrollTimeout) { clearTimeout(scrollTimeout); }
- scrollTimeout = setTimeout(function() {
- jQuery.event.dispatch.apply( context, args );
- }, execAsap === "execAsap"? 0 : 100);
- }
- };
-
- $.fn.smartscroll = function( fn ) {
- return fn ? this.bind( "smartscroll", fn ) : this.trigger( "smartscroll", ["execAsap"] );
- };
-
-
-})(jQuery);