mirror of
https://github.com/friendica/friendica
synced 2024-12-23 07:20:15 +00:00
Merge remote-tracking branch 'upstream/develop' into no-author-link
This commit is contained in:
Michael
commit
6f9ec690aa
17 changed files with 177 additions and 71 deletions
|
|
@ -37,7 +37,8 @@
|
|||
"npm-asset/jquery-datetimepicker": "^2.4.0",
|
||||
"npm-asset/jgrowl": "^1.4",
|
||||
"npm-asset/fullcalendar": "^3.0.1",
|
||||
"npm-asset/cropperjs": "1.2.2"
|
||||
"npm-asset/cropperjs": "1.2.2",
|
||||
"npm-asset/imagesloaded": "4.1.4"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
|
|
|
|||
109
composer.lock
generated
109
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "ab5a551aff0505691c4836d063fc5171",
|
||||
"content-hash": "4fcae78061a3eb72f91e4fa81e53af56",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asika/simple-console",
|
||||
|
|
@ -770,6 +770,49 @@
|
|||
],
|
||||
"time": "2018-01-03T13:39:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "npm-asset/ev-emitter",
|
||||
"version": "1.1.1",
|
||||
"dist": {
|
||||
"type": "tar",
|
||||
"url": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
|
||||
"reference": null,
|
||||
"shasum": "8f18b0ce5c76a5d18017f71c0a795c65b9138f2a"
|
||||
},
|
||||
"type": "npm-asset-library",
|
||||
"extra": {
|
||||
"npm-asset-bugs": {
|
||||
"url": "https://github.com/metafizzy/ev-emitter/issues"
|
||||
},
|
||||
"npm-asset-main": "ev-emitter.js",
|
||||
"npm-asset-directories": {
|
||||
"test": "test"
|
||||
},
|
||||
"npm-asset-repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/metafizzy/ev-emitter.git"
|
||||
},
|
||||
"npm-asset-scripts": {
|
||||
"test": "mocha test/test"
|
||||
}
|
||||
},
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "David DeSandro"
|
||||
}
|
||||
],
|
||||
"description": "lil' event emitter",
|
||||
"homepage": "https://github.com/metafizzy/ev-emitter#readme",
|
||||
"keywords": [
|
||||
"emitter",
|
||||
"event",
|
||||
"pubsub"
|
||||
],
|
||||
"time": "2017-07-06T13:46:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "npm-asset/fullcalendar",
|
||||
"version": "3.8.2",
|
||||
|
|
@ -882,6 +925,70 @@
|
|||
],
|
||||
"time": "2018-01-30T23:49:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "npm-asset/imagesloaded",
|
||||
"version": "4.1.4",
|
||||
"dist": {
|
||||
"type": "tar",
|
||||
"url": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz",
|
||||
"reference": null,
|
||||
"shasum": "1376efcd162bb768c34c3727ac89cc04051f3cc7"
|
||||
},
|
||||
"require": {
|
||||
"npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"npm-asset/chalk": ">=1.1.1,<2.0.0",
|
||||
"npm-asset/cheerio": ">=0.19.0,<0.20.0",
|
||||
"npm-asset/gulp": ">=3.9.0,<4.0.0",
|
||||
"npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
|
||||
"npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
|
||||
"npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
|
||||
"npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
|
||||
"npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
|
||||
"npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
|
||||
"npm-asset/gulp-util": ">=3.0.7,<4.0.0",
|
||||
"npm-asset/highlight.js": ">=8.9.1,<9.0.0",
|
||||
"npm-asset/marked": ">=0.3.5,<0.4.0",
|
||||
"npm-asset/minimist": ">=1.2.0,<2.0.0",
|
||||
"npm-asset/transfob": ">=1.0.0,<2.0.0"
|
||||
},
|
||||
"type": "npm-asset-library",
|
||||
"extra": {
|
||||
"npm-asset-bugs": {
|
||||
"url": "https://github.com/desandro/imagesloaded/issues"
|
||||
},
|
||||
"npm-asset-main": "imagesloaded.js",
|
||||
"npm-asset-directories": {
|
||||
"test": "test"
|
||||
},
|
||||
"npm-asset-repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/desandro/imagesloaded.git"
|
||||
},
|
||||
"npm-asset-scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
}
|
||||
},
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "David DeSandro"
|
||||
}
|
||||
],
|
||||
"description": "JavaScript is all like _You images done yet or what?_",
|
||||
"homepage": "https://github.com/desandro/imagesloaded",
|
||||
"keywords": [
|
||||
"dom",
|
||||
"images",
|
||||
"jquery-plugin",
|
||||
"loaded",
|
||||
"ui"
|
||||
],
|
||||
"time": "2018-01-02T16:56:03+00:00"
|
||||
},
|
||||
{
|
||||
"name": "npm-asset/jgrowl",
|
||||
"version": "1.4.6",
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ function ping_init(App $a)
|
|||
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
|
||||
$params = ['order' => ['created' => true]];
|
||||
$items = Item::select(local_user(), $fields, $condition, $params);
|
||||
$items = Item::select(local_user(), $fields, $condition, $params);
|
||||
|
||||
if (DBM::is_result($items)) {
|
||||
$items_unseen = dba::inArray($items);
|
||||
|
|
|
|||
|
|
@ -19,10 +19,6 @@ function update_community_content(App $a) {
|
|||
$text = '';
|
||||
}
|
||||
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
$replace = "<img\${1} dst=\"\${2}\"";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
|
||||
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ function update_display_content(App $a)
|
|||
echo "<section>";
|
||||
|
||||
$text = display_content($a, true, $profile_uid);
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
$replace = "<img\${1} dst=\"\${2}\"";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />" . L10n::t("[Embedded content - reload page to view]") . "<br />";
|
||||
|
|
|
|||
|
|
@ -25,10 +25,6 @@ function update_network_content(App $a)
|
|||
$text = "";
|
||||
}
|
||||
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
$replace = "<img\${1} dst=\"\${2}\"";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />" . L10n::t("[Embedded content - reload page to view]") . "<br />";
|
||||
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
|
||||
|
|
|
|||
|
|
@ -32,10 +32,6 @@ function update_notes_content(App $a) {
|
|||
|
||||
$text = notes_content($a, $profile_uid);
|
||||
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
$replace = "<img\${1} dst=\"\${2}\"";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
|
||||
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
|
||||
|
|
|
|||
|
|
@ -31,10 +31,6 @@ function update_profile_content(App $a) {
|
|||
|
||||
$text = profile_content($a, $profile_uid);
|
||||
|
||||
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
|
||||
$replace = "<img\${1} dst=\"\${2}\"";
|
||||
$text = preg_replace($pattern, $replace, $text);
|
||||
|
||||
if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
|
||||
$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
|
||||
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
|
||||
|
|
|
|||
|
|
@ -1070,9 +1070,11 @@ class Contact extends BaseObject
|
|||
'limit' => [$a->pager['start'], $a->pager['itemspage']]];
|
||||
$r = Item::select(local_user(), [], $condition, $params);
|
||||
|
||||
$o = conversation($a, dba::inArray($r), 'contact-posts', false);
|
||||
$items = dba::inArray($r);
|
||||
|
||||
$o = conversation($a, $items, 'contact-posts', false);
|
||||
|
||||
$o .= alt_pager($a, count($r));
|
||||
$o .= alt_pager($a, count($items));
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1009,7 +1009,7 @@ class PortableContact
|
|||
|
||||
// Maybe the page is unencrypted only?
|
||||
$xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
||||
if (!$serverret["success"] || ($serverret["body"] == "") || (empty($xmlobj) == 0) || !is_object($xmlobj)) {
|
||||
if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
|
||||
$server_url = str_replace("https://", "http://", $server_url);
|
||||
|
||||
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
|
||||
|
|
@ -1025,7 +1025,7 @@ class PortableContact
|
|||
$xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
||||
}
|
||||
|
||||
if (!$serverret["success"] || ($serverret["body"] == "") || (empty($xmlobj) == 0) || !is_object($xmlobj)) {
|
||||
if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
|
||||
// Workaround for bad configured servers (known nginx problem)
|
||||
if (!in_array($serverret["debug"]["http_code"], ["403", "404"])) {
|
||||
$failure = true;
|
||||
|
|
|
|||
|
|
@ -395,6 +395,47 @@ function NavUpdate() {
|
|||
timer = setTimeout(NavUpdate, updateInterval);
|
||||
}
|
||||
|
||||
function updateConvItems(data) {
|
||||
// add a new thread
|
||||
$('.toplevel_item',data).each(function() {
|
||||
var ident = $(this).attr('id');
|
||||
|
||||
// Add new top-level item.
|
||||
if ($('#' + ident).length == 0 && profile_page == 1) {
|
||||
$('#' + prev).after($(this));
|
||||
|
||||
// Replace already existing thread.
|
||||
} else {
|
||||
// Find out if the hidden comments are open, so we can keep it that way
|
||||
// if a new comment has been posted
|
||||
var id = $('.hide-comments-total', this).attr('id');
|
||||
if (typeof id != 'undefined') {
|
||||
id = id.split('-')[3];
|
||||
var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
|
||||
}
|
||||
|
||||
$('#' + ident).replaceWith($(this));
|
||||
|
||||
if (typeof id != 'undefined') {
|
||||
if (commentsOpen) {
|
||||
showHideComments(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
prev = ident;
|
||||
});
|
||||
|
||||
$('.like-rotator').hide();
|
||||
if (commentBusy) {
|
||||
commentBusy = false;
|
||||
$('body').css('cursor', 'auto');
|
||||
}
|
||||
/* autocomplete @nicknames */
|
||||
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl");
|
||||
/* autocomplete bbcode */
|
||||
$(".comment-edit-form textarea").bbco_autocomplete('bbcode');
|
||||
}
|
||||
|
||||
function liveUpdate(src) {
|
||||
if ((src == null) || stopped || !profile_uid) {
|
||||
$('.like-rotator').hide(); return;
|
||||
|
|
@ -418,6 +459,9 @@ function liveUpdate(src) {
|
|||
if ($(document).scrollTop() == 0) {
|
||||
force_update = true;
|
||||
}
|
||||
|
||||
var orgHeight = $("section").height();
|
||||
|
||||
var udargs = ((netargs.length) ? '/' + netargs : '');
|
||||
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
|
||||
|
||||
|
|
@ -426,52 +470,15 @@ function liveUpdate(src) {
|
|||
force_update = false;
|
||||
update_item = 0;
|
||||
|
||||
// add a new thread
|
||||
$('.toplevel_item',data).each(function() {
|
||||
var ident = $(this).attr('id');
|
||||
$('.wall-item-body', data).imagesLoaded(function() {
|
||||
updateConvItems(data);
|
||||
|
||||
if ($('#' + ident).length == 0 && profile_page == 1) {
|
||||
$('img',this).each(function() {
|
||||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
$('#' + prev).after($(this));
|
||||
} else {
|
||||
// Find out if the hidden comments are open, so we can keep it that way
|
||||
// if a new comment has been posted
|
||||
var id = $('.hide-comments-total', this).attr('id');
|
||||
if (typeof id != 'undefined') {
|
||||
id = id.split('-')[3];
|
||||
var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
|
||||
}
|
||||
|
||||
$('img',this).each(function() {
|
||||
$(this).attr('src',$(this).attr('dst'));
|
||||
});
|
||||
$('html').height($('html').height());
|
||||
$('#' + ident).replaceWith($(this));
|
||||
|
||||
if (typeof id != 'undefined') {
|
||||
if (commentsOpen) {
|
||||
showHideComments(id);
|
||||
}
|
||||
}
|
||||
$('html').height('auto');
|
||||
}
|
||||
prev = ident;
|
||||
// Update the scroll position.
|
||||
$(window).scrollTop($(window).scrollTop() + $("section").height() - orgHeight);
|
||||
});
|
||||
|
||||
callAddonHooks("postprocess_liveupdate");
|
||||
|
||||
$('.like-rotator').hide();
|
||||
if (commentBusy) {
|
||||
commentBusy = false;
|
||||
$('body').css('cursor', 'auto');
|
||||
}
|
||||
/* autocomplete @nicknames */
|
||||
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl");
|
||||
/* autocomplete bbcode */
|
||||
$(".comment-edit-form textarea").bbco_autocomplete('bbcode');
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
|
||||
<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
|
||||
<script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
|
||||
<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
|
||||
<script type="text/javascript" src="view/js/acl.js" ></script>
|
||||
<script type="text/javascript" src="view/asset/base64/base64.min.js" ></script>
|
||||
<script type="text/javascript" src="view/js/addon-hooks.js" ></script>
|
||||
|
|
|
|||
|
|
@ -66,8 +66,15 @@
|
|||
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
|
||||
<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
|
||||
<script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
|
||||
<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
|
||||
<script type="text/javascript" src="view/js/acl.js"></script>
|
||||
<script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
|
||||
<script type="text/javascript" src="view/js/addon-hooks.js" ></script>
|
||||
{{if is_array($addon_hooks)}}
|
||||
{{foreach $addon_hooks as $addon_hook}}
|
||||
<script type="text/javascript" src="addon/{{$addon_hook}}/{{$addon_hook}}.js"></script>
|
||||
{{/foreach}}
|
||||
{{/if}}
|
||||
<script type="text/javascript" src="view/js/main.js"></script>
|
||||
|
||||
<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
<div class="wall-item-content">
|
||||
{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
|
||||
{{$item.body}}
|
||||
<div class="wall-item-body">{{$item.body}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
</div>
|
||||
<div class="wall-item-content">
|
||||
{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
|
||||
<span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
|
||||
<span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
</div>
|
||||
<div class="wall-item-content">
|
||||
{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
|
||||
{{$item.body}}
|
||||
<div class="wall-item-body">{{$item.body}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
<div itemprop="description" class="wall-item-content">
|
||||
{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
|
||||
<span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
|
||||
<span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
Loading…
Reference in a new issue