aboutsummaryrefslogtreecommitdiffstats
path: root/apps/bookmarks
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-03-27 20:19:38 +0000
committerTom Needham <needham.thomas@gmail.com>2012-03-27 20:19:38 +0000
commitc8acd4a594d4ed21f9becca927762aa83f24c3d3 (patch)
tree270141aa92ec900831d976029551699770807725 /apps/bookmarks
parent892343c7c11e7ba967f69174820a501b3954badb (diff)
parentcb2dd97509ffd039fbd321aea4a8d631e3effcc7 (diff)
downloadnextcloud-server-c8acd4a594d4ed21f9becca927762aa83f24c3d3.tar.gz
nextcloud-server-c8acd4a594d4ed21f9becca927762aa83f24c3d3.zip
Merge branch 'master' into migration
Diffstat (limited to 'apps/bookmarks')
-rw-r--r--apps/bookmarks/bookmarksHelper.php7
-rw-r--r--apps/bookmarks/js/bookmarks.js6
2 files changed, 8 insertions, 5 deletions
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index 8def7401e2f..7ada69014fb 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -71,7 +71,7 @@ function getURLMetadata($url) {
return $metadata;
}
-function addBookmark($url, $title='', $tags='') {
+function addBookmark($url, $title, $tags='') {
$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
$_ut = "strftime('%s','now')";
@@ -93,6 +93,11 @@ function addBookmark($url, $title='', $tags='') {
$title = $metadata['title'];
}
+ if(empty($title)) {
+ $l = new OC_L10N('bookmarks');
+ $title = $l->t('unnamed');
+ }
+
$params=array(
htmlspecialchars_decode($url),
htmlspecialchars_decode($title),
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index fa5adde2545..9502af0a00d 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -9,9 +9,7 @@ $(document).ready(function() {
fillWindow($('.bookmarks_list'));
});
$(window).resize();
- $($('.bookmarks_list')).scroll(updateOnBottom);
-
- $('.bookmarks_list').empty();
+ $('.bookmarks_list').scroll(updateOnBottom).empty().width($('#content').width());
getBookmarks();
});
@@ -145,7 +143,7 @@ function updateBookmarksList(bookmark) {
'<p class="bookmark_title">'+
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
'</p>' +
- '<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
+ '<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
'</div>'
);
if(taglist != '') {