| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. |
| 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 * | 22 * |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 #include "core/html/HTMLLabelElement.h" | 26 #include "core/html/HTMLLabelElement.h" |
| 27 | 27 |
| 28 #include "core/HTMLNames.h" | 28 #include "core/HTMLNames.h" |
| 29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
| 30 #include "core/dom/ElementTraversal.h" | 30 #include "core/dom/ElementTraversal.h" |
| 31 #include "core/editing/EditingUtilities.h" |
| 31 #include "core/editing/FrameSelection.h" | 32 #include "core/editing/FrameSelection.h" |
| 32 #include "core/editing/SelectionController.h" | 33 #include "core/editing/SelectionController.h" |
| 33 #include "core/events/MouseEvent.h" | 34 #include "core/events/MouseEvent.h" |
| 34 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 35 #include "core/html/FormAssociatedElement.h" | 36 #include "core/html/FormAssociatedElement.h" |
| 36 #include "core/input/EventHandler.h" | 37 #include "core/input/EventHandler.h" |
| 37 | 38 |
| 38 namespace blink { | 39 namespace blink { |
| 39 | 40 |
| 40 using namespace HTMLNames; | 41 using namespace HTMLNames; |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 155 |
| 155 // If the click is not simulated and the text of the label element | 156 // If the click is not simulated and the text of the label element |
| 156 // is selected by dragging over it, then return without passing the | 157 // is selected by dragging over it, then return without passing the |
| 157 // click event to control element. | 158 // click event to control element. |
| 158 // Note: a click event may be not a mouse event if created by | 159 // Note: a click event may be not a mouse event if created by |
| 159 // document.createEvent(). | 160 // document.createEvent(). |
| 160 if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) { | 161 if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) { |
| 161 if (LocalFrame* frame = document().frame()) { | 162 if (LocalFrame* frame = document().frame()) { |
| 162 // Check if there is a selection and click is not on the | 163 // Check if there is a selection and click is not on the |
| 163 // selection. | 164 // selection. |
| 164 if (!Position::nodeIsUserSelectNone(this) && frame->selection().
isRange() && !frame->eventHandler().selectionController().mouseDownWasSingleClic
kInSelection()) | 165 if (!nodeIsUserSelectNone(this) && frame->selection().isRange()
&& !frame->eventHandler().selectionController().mouseDownWasSingleClickInSelecti
on()) |
| 165 isLabelTextSelected = true; | 166 isLabelTextSelected = true; |
| 166 // If selection is there and is single click i.e. text is | 167 // If selection is there and is single click i.e. text is |
| 167 // selected by dragging over label text, then return. | 168 // selected by dragging over label text, then return. |
| 168 // Click count >=2, meaning double click or triple click, | 169 // Click count >=2, meaning double click or triple click, |
| 169 // should pass click event to control element. | 170 // should pass click event to control element. |
| 170 // Only in case of drag, *neither* we pass the click event, | 171 // Only in case of drag, *neither* we pass the click event, |
| 171 // *nor* we focus the control element. | 172 // *nor* we focus the control element. |
| 172 if (isLabelTextSelected && frame->eventHandler().clickCount() ==
1) | 173 if (isLabelTextSelected && frame->eventHandler().clickCount() ==
1) |
| 173 return; | 174 return; |
| 174 } | 175 } |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 284 |
| 284 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const
AtomicString& attributeValue) | 285 void HTMLLabelElement::parseAttribute(const QualifiedName& attributeName, const
AtomicString& attributeValue) |
| 285 { | 286 { |
| 286 if (attributeName == formAttr) | 287 if (attributeName == formAttr) |
| 287 formAttributeChanged(); | 288 formAttributeChanged(); |
| 288 else | 289 else |
| 289 HTMLElement::parseAttribute(attributeName, attributeValue); | 290 HTMLElement::parseAttribute(attributeName, attributeValue); |
| 290 } | 291 } |
| 291 | 292 |
| 292 } // namespace | 293 } // namespace |
| OLD | NEW |