Fix the folder's path in the search results page

pull/1/head
yflory 8 years ago
parent 3d2e628e57
commit de420de021

@ -416,6 +416,11 @@ span {
} }
.path { .path {
font-style: italic; font-style: italic;
direction: rtl;
.element {
display: inline-block;
margin-right: 5px;
}
} }
.title { .title {
font-weight: bold; font-weight: bold;

@ -1250,12 +1250,11 @@ define([
}; };
// Create the title block with the "parent folder" button // Create the title block with the "parent folder" button
var createTitle = function (path, noStyle) { var createTitle = function ($container, path, noStyle) {
if (!path || path.length === 0) { return; } if (!path || path.length === 0) { return; }
var isTrash = filesOp.isPathIn(path, [TRASH]); var isTrash = filesOp.isPathIn(path, [TRASH]);
var $title = $driveToolbar.find('.path'); if (APP.mobile() && !noStyle) { // noStyle means title in search result
if (APP.mobile()) { return $container;
return $title;
} }
var el = path[0] === SEARCH ? undefined : filesOp.find(path); var el = path[0] === SEARCH ? undefined : filesOp.find(path);
path = path[0] === SEARCH ? path.slice(0,1) : path; path = path[0] === SEARCH ? path.slice(0,1) : path;
@ -1281,12 +1280,11 @@ define([
if (idx === 0) { name = getPrettyName(p); } if (idx === 0) { name = getPrettyName(p); }
else { else {
var $span2 = $('<span>', {'class': 'element separator'}).text(' / '); var $span2 = $('<span>', {'class': 'element separator'}).text(' / ');
$title.prepend($span2); $container.prepend($span2);
} }
$span.text(name).prependTo($title); $span.text(name).prependTo($container);
}); });
return $title;
}; };
var createInfoBox = function (path) { var createInfoBox = function (path) {
@ -1764,7 +1762,8 @@ define([
path.pop(); path.pop();
path.push(r.data.title); path.push(r.data.title);
} }
var $path = $('<td>', {'class': 'col1 path'}).html(createTitle(path, true).html()); var $path = $('<td>', {'class': 'col1 path'});
createTitle($path, path, true);
var parentPath = path.slice(); var parentPath = path.slice();
var $a; var $a;
if (parentPath) { if (parentPath) {
@ -1859,7 +1858,7 @@ define([
// NewButton can be undefined if we're in read only mode // NewButton can be undefined if we're in read only mode
createNewButton(isInRoot, $toolbar.find('.leftside')); createNewButton(isInRoot, $toolbar.find('.leftside'));
createTitle(path).appendTo($toolbar.find('.path')); createTitle($toolbar.find('.path'), path);
if (APP.mobile()) { if (APP.mobile()) {
var $context = $('<button>', {'class': 'element right dropdown-bar', id: 'contextButton'}); var $context = $('<button>', {'class': 'element right dropdown-bar', id: 'contextButton'});

Loading…
Cancel
Save