summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 19:48:34 +0000
committerfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 19:48:34 +0000
commite48954efda53b4074f65d201a09cd2f7ad4c49bc (patch)
treea4fd340aba8423897876401af0deb3915e7a9041
parentc4043d950bf0316f5a7eacdc6fc51605442c8d97 (diff)
downloadchromium_src-e48954efda53b4074f65d201a09cd2f7ad4c49bc.zip
chromium_src-e48954efda53b4074f65d201a09cd2f7ad4c49bc.tar.gz
chromium_src-e48954efda53b4074f65d201a09cd2f7ad4c49bc.tar.bz2
Fix BMM paste on mac and list hover artifact.
The Bookamark manager on mac would paste a url into a bookmarks url field, and then the same paste event would propagate up to the list and paste the page as a new bookmark. This stops propagation of paste events from the text fields in the list. Also, now that the list has spacers for the dynamic rendering, the spacers would get a 2 pixel hover effect. This removes that. You can see it by slowly moving from the last bookmark down to below the bottom of the list. BUG=43442 TEST=NONE Review URL: http://codereview.chromium.org/2805031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50758 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js3
-rw-r--r--chrome/browser/resources/shared/css/list.css8
-rw-r--r--chrome/browser/resources/shared/js/cr/ui/list.js2
3 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js
index 73345da..12f6936 100644
--- a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js
+++ b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js
@@ -476,7 +476,8 @@ cr.define('bmm', function() {
e.stopPropagation();
}
- var eventsToStop = ['mousedown', 'mouseup', 'contextmenu', 'dblclick'];
+ var eventsToStop =
+ ['mousedown', 'mouseup', 'contextmenu', 'dblclick', 'paste'];
eventsToStop.forEach(function(type) {
labelInput.addEventListener(type, stopPropagation);
});
diff --git a/chrome/browser/resources/shared/css/list.css b/chrome/browser/resources/shared/css/list.css
index cbc3471..60cad42 100644
--- a/chrome/browser/resources/shared/css/list.css
+++ b/chrome/browser/resources/shared/css/list.css
@@ -63,3 +63,11 @@ list > [selected]:hover {
background-color: hsl(214, 91%, 87%);
border-color: hsl(214, 91%, 65%);
}
+
+list > .spacer {
+ border: 0;
+ -webkit-box-sizing: border-box;
+ overflow: hidden;
+ visibility: hidden;
+ margin: 0;
+}
diff --git a/chrome/browser/resources/shared/js/cr/ui/list.js b/chrome/browser/resources/shared/js/cr/ui/list.js
index f2412f5..7fb9289 100644
--- a/chrome/browser/resources/shared/js/cr/ui/list.js
+++ b/chrome/browser/resources/shared/js/cr/ui/list.js
@@ -225,6 +225,8 @@ cr.define('cr.ui', function() {
// Add fillers.
this.beforeFiller_ = this.ownerDocument.createElement('div');
this.afterFiller_ = this.ownerDocument.createElement('div');
+ this.beforeFiller_.className = 'spacer';
+ this.afterFiller_.className = 'spacer';
this.appendChild(this.beforeFiller_);
this.appendChild(this.afterFiller_);