| 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 |
| 11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
| 12 * | 12 * |
| 13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
| 17 * | 17 * |
| 18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
| 19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
| 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 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 "HTMLNames.h" | 28 #include "HTMLNames.h" |
| 29 #include "core/dom/ElementTraversal.h" | 29 #include "core/dom/ElementTraversal.h" |
| 30 #include "core/editing/FrameSelection.h" | |
| 31 #include "core/events/Event.h" | 30 #include "core/events/Event.h" |
| 32 #include "core/frame/LocalFrame.h" | |
| 33 #include "core/html/FormAssociatedElement.h" | 31 #include "core/html/FormAssociatedElement.h" |
| 34 | 32 |
| 35 namespace WebCore { | 33 namespace WebCore { |
| 36 | 34 |
| 37 using namespace HTMLNames; | 35 using namespace HTMLNames; |
| 38 | 36 |
| 39 static bool supportsLabels(const Element& element) | 37 static bool supportsLabels(const Element& element) |
| 40 { | 38 { |
| 41 if (!element.isHTMLElement()) | 39 if (!element.isHTMLElement()) |
| 42 return false; | 40 return false; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 node = node->parentOrShadowHostNode(); | 129 node = node->parentOrShadowHostNode(); |
| 132 } | 130 } |
| 133 return false; | 131 return false; |
| 134 } | 132 } |
| 135 | 133 |
| 136 void HTMLLabelElement::defaultEventHandler(Event* evt) | 134 void HTMLLabelElement::defaultEventHandler(Event* evt) |
| 137 { | 135 { |
| 138 static bool processingClick = false; | 136 static bool processingClick = false; |
| 139 | 137 |
| 140 if (evt->type() == EventTypeNames::click && !processingClick) { | 138 if (evt->type() == EventTypeNames::click && !processingClick) { |
| 141 // If text of label element is selected, do not pass | |
| 142 // the event to control element. | |
| 143 if (document().frame()->selection().selection().isRange()) | |
| 144 return; | |
| 145 | |
| 146 RefPtrWillBeRawPtr<HTMLElement> element = control(); | 139 RefPtrWillBeRawPtr<HTMLElement> element = control(); |
| 147 | 140 |
| 148 // If we can't find a control or if the control received the click | 141 // If we can't find a control or if the control received the click |
| 149 // event, then there's no need for us to do anything. | 142 // event, then there's no need for us to do anything. |
| 150 if (!element || (evt->target() && element->containsIncludingShadowDOM(ev
t->target()->toNode()))) | 143 if (!element || (evt->target() && element->containsIncludingShadowDOM(ev
t->target()->toNode()))) |
| 151 return; | 144 return; |
| 152 | 145 |
| 153 if (evt->target() && isInInteractiveContent(evt->target()->toNode())) | 146 if (evt->target() && isInInteractiveContent(evt->target()->toNode())) |
| 154 return; | 147 return; |
| 155 | 148 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 | 182 |
| 190 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) | 183 void HTMLLabelElement::accessKeyAction(bool sendMouseEvents) |
| 191 { | 184 { |
| 192 if (HTMLElement* element = control()) | 185 if (HTMLElement* element = control()) |
| 193 element->accessKeyAction(sendMouseEvents); | 186 element->accessKeyAction(sendMouseEvents); |
| 194 else | 187 else |
| 195 HTMLElement::accessKeyAction(sendMouseEvents); | 188 HTMLElement::accessKeyAction(sendMouseEvents); |
| 196 } | 189 } |
| 197 | 190 |
| 198 } // namespace | 191 } // namespace |
| OLD | NEW |