Changeset 9928

Timestamp:

08/02/07 12:32:15 (18 months ago)

Author:

simonjb

Message:

Fixes #3750: Please rename onklick event.

Location:

dijit/trunk

Files:

• ColorPalette.js (modified) (2 diffs)
• form/templates/ComboBox.html (modified) (1 diff)
• form/templates/ComboButton.html (modified) (2 diffs)
• layout/templates/AccordionPane.html (modified) (1 diff)
• Menu.js (modified) (1 diff)
• tests/module.js (modified) (1 diff)
• tests/ondijitclick.html (moved) (moved from dijit/trunk/tests/onklick.html) (7 diffs)
• tests/ondijitclick.js (moved) (moved from dijit/trunk/tests/onklick.js) (1 diff)
• _Widget.js (modified) (1 diff)

dijit/trunk/ColorPalette.js

@@ -110 +110 @@
                                 var highlightStyle = highlightNode.style;
                                 highlightStyle.color = highlightStyle.backgroundColor = highlightNode.color;
-                                dojo.forEach(["Klick", "MouseOut", "MouseOver", "Blur", "Focus"], function(handler){
+                                dojo.forEach(["Dijitclick", "MouseOut", "MouseOver", "Blur", "Focus"], function(handler){
                                         this.connect(highlightNode, "on"+handler.toLowerCase(), "_onColor"+handler);
                                 }, this);
@@ -168 +168 @@
         },
 
-        _onColorKlick: function(/*Event*/ evt){
+        _onColorDijitclick: function(/*Event*/ evt){
                 // summary:
                 //              Handler for click, enter key & space key. Selects the color.

dijit/trunk/form/templates/ComboBox.html

@@ -12 +12 @@
         ></td><td class='dijitReset dijitRight dijitButtonNode dijitDownArrowButton'
                         dojoAttachPoint="downArrowNode"
-                        dojoAttachEvent="onklick:_onArrowClick,onmousedown:_onMouse,onmouseup:_onMouse,onmouseover:_onMouse,onmouseout:_onMouse"
+                        dojoAttachEvent="ondijitclick:_onArrowClick,onmousedown:_onMouse,onmouseup:_onMouse,onmouseover:_onMouse,onmouseout:_onMouse"
                 ><div waiRole="presentation" tabIndex="-1">&#9660;</div>
         </td></tr>

dijit/trunk/form/templates/ComboButton.html

@@ -5 +5 @@
                 <td     class="dijitStretch dijitButtonContents dijitButtonNode"
                         tabIndex="${tabIndex}"
-                        dojoAttachEvent="onklick:_onButtonClick"  dojoAttachPoint="titleNode"
+                        dojoAttachEvent="ondijitclick:_onButtonClick"  dojoAttachPoint="titleNode"
                         waiRole="button" waiState="labelledby-${id}_label">
                         <div class="dijitInline ${iconClass}"></div>
@@ -12 +12 @@
                 <td class='dijitReset dijitRight dijitButtonNode dijitDownArrowButton'
                         dojoAttachPoint="popupStateNode,focusNode"
-                        dojoAttachEvent="onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse,onklick:_onArrowClick, onkeypress:_onKey"
+                        dojoAttachEvent="onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse,ondijitclick:_onArrowClick, onkeypress:_onKey"
                         baseClass="dijitComboButtonDownArrow"
                         title="${optionsTitle}"

dijit/trunk/layout/templates/AccordionPane.html

@@ -1 +1 @@
 <div class='dijitAccordionPane'
-        ><div dojoAttachPoint='titleNode,focusNode' dojoAttachEvent='onklick:_onTitleClick,onkeypress:_onKeyPress'
+        ><div dojoAttachPoint='titleNode,focusNode' dojoAttachEvent='ondijitclick:_onTitleClick,onkeypress:_onKeyPress'
                 class='dijitAccordionTitle' wairole="tab"
                 ><div class='dijitAccordionArrow'></div

dijit/trunk/Menu.js

@@ -392 +392 @@
         templateString:
                  '<tr class="dijitReset dijitMenuItem"'
-                +'dojoAttachEvent="onmouseover:_onHover,onmouseout:_onUnhover,onklick:_onClick">'
+                +'dojoAttachEvent="onmouseover:_onHover,onmouseout:_onUnhover,ondijitclick:_onClick">'
                 +'<td class="dijitReset"><div class="dijitMenuItemIcon ${iconClass}"></div></td>'
                 +'<td tabIndex="-1" class="dijitReset dijitMenuItemLabel" dojoAttachPoint="containerNode" waiRole="menuitem"></td>'

dijit/trunk/tests/module.js

@@ -7 +7 @@
         dojo.require("dijit.tests.Container");
         dojo.require("dijit.tests.layout.ContentPane");
-        dojo.require("dijit.tests.onklick");
+        dojo.require("dijit.tests.ondijitclick");
         dojo.require("dijit.tests.form.Form");
 }catch(e){

dijit/trunk/tests/ondijitclick.html

@@ -4 +4 @@
 <head>
 
-        <title>Test Dijit Internal Event: "onklick"</title>
+        <title>Test Dijit Internal Event: "ondijitclick"</title>
 
         <script type="text/javascript" src="../../dojo/dojo.js" djConfig="isDebug: true, parseOnLoad: true"></script>
@@ -12 +12 @@
                 dojo.require("dojo.parser");
 
-                dojo.declare("dijit.WidgetWithOnklick",
+                dojo.declare("dijit.WidgetWithOndijitclick",
                         dijit._Widget,
                         {
-                                onklickCount: 0,
-                                _onKlick: function() {
-                                        this.onklickCount++;
+                                clickCount: 0,
+                                _onClick: function() {
+                                        this.clickCount++;
                                 },
                                 postCreate: function() {
-                                        this.connect(this.domNode, "onklick", "_onKlick");
+                                        this.connect(this.domNode, "ondijitclick", "_onClick");
                                 }
                         }
@@ -26 +26 @@
 
                 dojo.addOnLoad(function(){
-                        doh.register("onklick",
+                        doh.register("ondijitclick",
                                 [
                                         {
-                                                name: "onklick fires once on a space-key-up",
+                                                name: "ondijitclick fires once on a space-key-up",
                                                 runTest: function(t){
                                                         var w = dijit.byId("widget1");
@@ -42 +42 @@
                                                                 e.initKeyEvent("keyup",true,true,null,false,false,false,false,32,0);
                                                                 w.domNode.focus();
-                                                                w.onklickCount = 0;
+                                                                w.clickCount = 0;
                                                                 w.domNode.dispatchEvent(e);
-                                                                t.is(1, w.onklickCount);
+                                                                t.is(1, w.clickCount);
                                                         }
                                                 }
                                         },
                                         {
-                                                name: "onklick fires once on an enter-key-down",
+                                                name: "ondijitclick fires once on an enter-key-down",
                                                 runTest: function(t){
                                                         var w = dijit.byId("widget1");
@@ -62 +62 @@
                                                                 e.initKeyEvent("keydown",true,true,null,false,false,false,false,13,0);
                                                                 w.domNode.focus();
-                                                                w.onklickCount = 0;
+                                                                w.clickCount = 0;
                                                                 w.domNode.dispatchEvent(e);
-                                                                t.is(1, w.onklickCount);
+                                                                t.is(1, w.clickCount);
                                                         }
                                                 }
                                         },
                                         {
-                                                name: "onklick fires once on a mouse click",
+                                                name: "ondijitclick fires once on a mouse click",
                                                 runTest: function(t){
                                                         var w = dijit.byId("widget1");
@@ -77 +77 @@
                                                                 var e = document.createEvent("MouseEvents");
                                                                 e.initMouseEvent('click', true, true, document.defaultView, 1, 0, 0, 3, 3, false, false, false, false, 0, w.domNode);
-                                                                w.onklickCount = 0;
+                                                                w.clickCount = 0;
                                                                 w.domNode.dispatchEvent(e);
-                                                                t.is(1, w.onklickCount);
+                                                                t.is(1, w.clickCount);
                                                         }
                                                 }
@@ -91 +91 @@
 </head>
 <body class="tundra">
-        <div id="widget1" dojoType="dijit.WidgetWithOnklick"></div>
+        <div id="widget1" dojoType="dijit.WidgetWithOndijitclick"></div>
 </body>
 </html>

dijit/trunk/tests/ondijitclick.js

@@ -1 @@
-dojo.provide("dijit.tests.onklick");
+dojo.provide("dijit.tests.ondijitclick");
 
 if(dojo.isBrowser){
-        doh.registerUrl("dijit.tests.onklick", dojo.moduleUrl("dijit", "tests/onklick.html"));
+        doh.registerUrl("dijit.tests.ondijitclick", dojo.moduleUrl("dijit", "tests/ondijitclick.html"));
 }

dijit/trunk/_Widget.js

@@ -219 +219 @@
                 //              Connects specified obj/event to specified method of this object
                 //              and registers for disconnect() on widget destroy.
-                //              Special event: "onklick" triggers on a click or enter-down or space-up
+                //              Special event: "ondijitclick" triggers on a click or enter-down or space-up
                 //              Similar to dojo.connect() but takes three arguments rather than four.
                 var handles =[];
-                if(event == "onklick"){
+                if(event == "ondijitclick"){
                         var w = this;
                         // add key based click activation for unsupported nodes.