Permalink
Browse files

added the start of a new installer, added the latest version of dojo

git-svn-id: http://svn.psychdesktop.net/trunk@277 815afad1-63b8-44ff-8d19-411ecde00fa5
  • Loading branch information...
1 parent 4ec725e commit 81b27f3b2ac917ef274dc0a6c1c7e4be07acb54a Will Riley committed Jul 23, 2007
Showing with 25,741 additions and 12,939 deletions.
  1. +39 −29 desktop/dojo/dijit/ColorPalette.js
  2. +2 −2 desktop/dojo/dijit/Declaration.js
  3. +44 −33 desktop/dojo/dijit/Dialog.js
  4. +1 −1 desktop/dojo/dijit/Editor.js
  5. +77 −61 desktop/dojo/dijit/Menu.js
  6. +2 −3 desktop/dojo/dijit/ProgressBar.js
  7. +9 −6 desktop/dojo/dijit/TitlePane.js
  8. +2 −5 desktop/dojo/dijit/Tooltip.js
  9. +7 −13 desktop/dojo/dijit/Tree.js
  10. +17 −10 desktop/dojo/dijit/_Calendar.js
  11. +1 −3 desktop/dojo/dijit/_Container.js
  12. +43 −43 desktop/dojo/dijit/_Templated.js
  13. +12 −5 desktop/dojo/dijit/_Widget.js
  14. +15 −0 desktop/dojo/dijit/_base.js
  15. +349 −0 desktop/dojo/dijit/_base/focus.js
  16. +85 −0 desktop/dojo/dijit/_base/manager.js
  17. +172 −0 desktop/dojo/dijit/_base/place.js
  18. +217 −0 desktop/dojo/dijit/_base/popup.js
  19. +33 −0 desktop/dojo/dijit/_base/scroll.js
  20. +43 −0 desktop/dojo/dijit/_base/sniff.js
  21. +132 −0 desktop/dojo/dijit/_base/typematic.js
  22. +121 −0 desktop/dojo/dijit/_base/wai.js
  23. +44 −0 desktop/dojo/dijit/_base/window.js
  24. +25 −40 desktop/dojo/dijit/_editor/RichText.js
  25. +3 −3 desktop/dojo/dijit/_editor/_Plugin.js
  26. +12 −10 desktop/dojo/dijit/_editor/plugins/LinkDialog.js
  27. +27 −27 desktop/dojo/dijit/_tree/Controller.js
  28. +0 −1 desktop/dojo/dijit/_tree/Node.html
  29. +1 −1 desktop/dojo/dijit/_tree/Tree.html
  30. +47 −64 desktop/dojo/dijit/bench/benchTool.html
  31. +3 −0 desktop/dojo/dijit/changes.txt
  32. +19 −7,487 desktop/dojo/dijit/dijit-all.js
  33. +1,545 −1,137 desktop/dojo/dijit/dijit-all.js.uncompressed.js
  34. +1 −1 desktop/dojo/dijit/dijit.js
  35. +1,482 −1,141 desktop/dojo/dijit/dijit.js.uncompressed.js
  36. +61 −44 desktop/dojo/dijit/form/Button.js
  37. +13 −21 desktop/dojo/dijit/form/Checkbox.js
  38. +38 −27 desktop/dojo/dijit/form/ComboBox.js
  39. +6 −91 desktop/dojo/dijit/form/DateTextbox.js
  40. +1 −1 desktop/dojo/dijit/form/FilteringSelect.js
  41. +109 −50 desktop/dojo/dijit/form/InlineEditBox.js
  42. +140 −45 desktop/dojo/dijit/form/Slider.js
  43. +61 −34 desktop/dojo/dijit/form/Textarea.js
  44. +14 −15 desktop/dojo/dijit/form/Textbox.js
  45. +111 −0 desktop/dojo/dijit/form/TimeTextbox.js
  46. +7 −15 desktop/dojo/dijit/form/ValidationTextbox.js
  47. +11 −8 desktop/dojo/dijit/form/_DropDownTextBox.js
  48. +64 −47 desktop/dojo/dijit/form/_FormWidget.js
  49. +5 −9 desktop/dojo/dijit/form/_Spinner.js
  50. +216 −0 desktop/dojo/dijit/form/_TimePicker.js
  51. +1 −0 desktop/dojo/dijit/form/nls/Textarea.js
  52. +4 −4 desktop/dojo/dijit/form/templates/Button.html
  53. +2 −2 desktop/dojo/dijit/form/templates/Checkbox.html
  54. +4 −4 desktop/dojo/dijit/form/templates/ComboBox.html
  55. +6 −6 desktop/dojo/dijit/form/templates/ComboButton.html
  56. +6 −5 desktop/dojo/dijit/form/templates/DropDownButton.html
  57. +13 −13 desktop/dojo/dijit/form/templates/HorizontalSlider.html
  58. +7 −5 desktop/dojo/dijit/form/templates/InlineEditBox.html
  59. +7 −7 desktop/dojo/dijit/form/templates/Spinner.html
  60. +1 −1 desktop/dojo/dijit/form/templates/Textbox.html
  61. +6 −0 desktop/dojo/dijit/form/templates/TimePicker.html
  62. +11 −11 desktop/dojo/dijit/form/templates/VerticalSlider.html
  63. +17 −16 desktop/dojo/dijit/layout/AccordionContainer.js
  64. +16 −17 desktop/dojo/dijit/layout/ContentPane.js
  65. +9 −5 desktop/dojo/dijit/layout/LayoutContainer.js
  66. +108 −133 desktop/dojo/dijit/layout/SplitContainer.js
  67. +29 −21 desktop/dojo/dijit/layout/StackContainer.js
  68. +6 −4 desktop/dojo/dijit/layout/TabContainer.js
  69. +11 −9 desktop/dojo/dijit/layout/_LayoutWidget.js
  70. +4 −4 desktop/dojo/dijit/layout/templates/AccordionPane.html
  71. +3 −1 desktop/dojo/dijit/layout/templates/TooltipDialog.html
  72. +7 −7 desktop/dojo/dijit/templates/Calendar.html
  73. +2 −2 desktop/dojo/dijit/templates/Dialog.html
  74. +2 −2 desktop/dojo/dijit/templates/TitlePane.html
  75. +181 −0 desktop/dojo/dijit/tests/_Templated.html
  76. +9 −0 desktop/dojo/dijit/tests/_Templated.js
  77. +70 −0 desktop/dojo/dijit/tests/_base/manager.js
  78. +45 −0 desktop/dojo/dijit/tests/_base/test_FocusManager.html
  79. +136 −0 desktop/dojo/dijit/tests/_base/test_focusWidget.html
  80. +402 −0 desktop/dojo/dijit/tests/_base/test_placeStrict.html
  81. +56 −0 desktop/dojo/dijit/tests/_base/test_typematic.html
  82. +10 −10 desktop/dojo/dijit/tests/countries.json
  83. +44 −0 desktop/dojo/dijit/tests/form/comboBoxDataToo.json
  84. +6 −6 desktop/dojo/dijit/tests/form/test_Button.html
  85. +5 −5 desktop/dojo/dijit/tests/form/test_Checkbox.html
  86. +19 −9 desktop/dojo/dijit/tests/form/test_ComboBox.html
  87. +0 −1 desktop/dojo/dijit/tests/form/test_ComboBox_destroy.html
  88. +13 −19 desktop/dojo/dijit/tests/form/test_FilteringSelect.html
  89. +56 −23 desktop/dojo/dijit/tests/form/test_InlineEditBox.html
  90. +72 −9 desktop/dojo/dijit/tests/form/test_Slider.html
  91. +2 −2 desktop/dojo/dijit/tests/form/test_Spinner.html
  92. +6 −5 desktop/dojo/dijit/tests/form/test_Textarea.html
  93. +11 −75 desktop/dojo/dijit/tests/form/test_validate.html
  94. +4 −0 desktop/dojo/dijit/tests/i18n/README
  95. +258 −0 desktop/dojo/dijit/tests/i18n/currency.html
  96. +173 −0 desktop/dojo/dijit/tests/i18n/date.html
  97. +17 −0 desktop/dojo/dijit/tests/i18n/module.js
  98. +214 −0 desktop/dojo/dijit/tests/i18n/number.html
  99. +206 −0 desktop/dojo/dijit/tests/i18n/test_i18n.js
  100. +173 −0 desktop/dojo/dijit/tests/i18n/textbox.html
  101. +210 −0 desktop/dojo/dijit/tests/i18n/time.html
  102. +112 −27 desktop/dojo/dijit/tests/layout/ContentPane.html
  103. +1 −1 desktop/dojo/dijit/tests/layout/ContentPane.js
  104. +18 −8 desktop/dojo/dijit/tests/layout/combotab.html
  105. +2 −0 desktop/dojo/dijit/tests/layout/test_ContentPane.html
  106. +24 −11 desktop/dojo/dijit/tests/layout/test_Layout.html
  107. +35 −35 desktop/dojo/dijit/tests/layout/test_LayoutCode.html
  108. +4 −4 desktop/dojo/dijit/tests/layout/test_StackContainer.html
  109. +4 −9 desktop/dojo/dijit/tests/layout/test_TabContainer.html
  110. +2 −1 desktop/dojo/dijit/tests/module.js
  111. +4 −1 desktop/dojo/dijit/tests/onklick.html
  112. +5 −5 desktop/dojo/dijit/tests/test_Calendar.html
  113. +1 −1 desktop/dojo/dijit/tests/test_ColorPalette.html
  114. +5 −1 desktop/dojo/dijit/tests/test_Declaration.html
  115. +4 −3 desktop/dojo/dijit/tests/test_Dialog.html
  116. +1 −1 desktop/dojo/dijit/tests/test_Menu.html
  117. +1 −1 desktop/dojo/dijit/tests/test_TitlePane.html
  118. +24 −7 desktop/dojo/dijit/tests/test_Toolbar.html
  119. +2 −2 desktop/dojo/dijit/tests/test_Tree.html
  120. +88 −20 desktop/dojo/dijit/themes/dijit.css
  121. +20 −20 desktop/dojo/dijit/themes/noir/noir.html
  122. +2 −4 desktop/dojo/dijit/themes/templateThemeTest.html
  123. +29 −13 desktop/dojo/dijit/themes/themeTester.html
  124. BIN desktop/dojo/dijit/themes/tundra/images/arrowDown.png
  125. BIN desktop/dojo/dijit/themes/tundra/images/arrowLeft.png
  126. BIN desktop/dojo/dijit/themes/tundra/images/arrowRight.png
  127. BIN desktop/dojo/dijit/themes/tundra/images/arrowUp.png
  128. BIN desktop/dojo/dijit/themes/tundra/images/checkmarkNoBorder.gif
  129. BIN desktop/dojo/dijit/themes/tundra/images/checkmarkNoBorder.png
  130. +160 −189 desktop/dojo/dijit/themes/tundra/tundra.css
  131. +29 −10 desktop/dojo/dojo/build.txt
  132. +216 −0 desktop/dojo/dojo/colors.js
  133. +1 −1 desktop/dojo/dojo/currency.js
  134. +669 −0 desktop/dojo/dojo/data/ItemFileReadStore.js
  135. +480 −0 desktop/dojo/dojo/data/ItemFileWriteStore.js
  136. +6 −17 desktop/dojo/dojo/date.js
  137. +41 −37 desktop/dojo/dojo/date/locale.js
  138. +9 −3 desktop/dojo/dojo/dnd/avatar.js
  139. +104 −101 desktop/dojo/dojo/dnd/container.js
  140. +7 −7 desktop/dojo/dojo/dnd/manager.js
  141. +25 −14 desktop/dojo/dojo/dnd/move.js
  142. +118 −122 desktop/dojo/dojo/dnd/selector.js
  143. +139 −59 desktop/dojo/dojo/dnd/source.js
  144. +1 −2 desktop/dojo/dojo/dojo.js
  145. +215 −146 desktop/dojo/dojo/dojo.js.uncompressed.js
  146. +23 −36 desktop/dojo/dojo/fx.js
  147. +154 −0 desktop/dojo/dojo/nls/colors.js
  148. +21 −18 desktop/dojo/dojo/number.js
  149. +14 −17 desktop/dojo/dojo/parser.js
  150. +1 −1 desktop/dojo/dojo/rpc/RpcService.js
  151. +19 −2 desktop/dojo/dojo/string.js
  152. +26 −16 desktop/dojo/dojo/tests/_base/Color.js
  153. +17 −3 desktop/dojo/dojo/tests/_base/html.html
  154. +1 −0 desktop/dojo/dojo/tests/_base/html.js
  155. +110 −0 desktop/dojo/dojo/tests/_base/html_rtl.html
  156. +48 −0 desktop/dojo/dojo/tests/colors.js
  157. +2 −7 desktop/dojo/dojo/tests/currency.js
  158. +2 −1 desktop/dojo/dojo/tests/data.js
  159. +10 −0 desktop/dojo/dojo/tests/data/ItemFileReadStore.js
  160. +636 −0 desktop/dojo/dojo/tests/data/ItemFileWriteStore.js
  161. +21 −0 desktop/dojo/dojo/tests/data/countries_withDates.json
  162. +44 −0 desktop/dojo/dojo/tests/data/geography_hierarchy_large.json
  163. +11 −0 desktop/dojo/dojo/tests/data/geography_hierarchy_small.json
  164. +2,050 −0 desktop/dojo/dojo/tests/data/readOnlyItemFileTestTemplates.js
  165. +9 −0 desktop/dojo/dojo/tests/data/runTests.html
  166. +19 −9 desktop/dojo/dojo/tests/date/locale.js
  167. +2 −1 desktop/dojo/dojo/tests/dnd/dndDefault.css
  168. +47 −59 desktop/dojo/dojo/tests/dnd/flickr_viewer.html
  169. +8 −1 desktop/dojo/dojo/tests/dnd/test_box_constraints.html
  170. +15 −15 desktop/dojo/dojo/tests/dnd/test_container.html
  171. +67 −0 desktop/dojo/dojo/tests/dnd/test_container_markup.html
  172. +50 −27 desktop/dojo/dojo/tests/dnd/test_dnd.html
  173. +1 −1 desktop/dojo/dojo/tests/dnd/test_form.html
  174. +4 −12 desktop/dojo/dojo/tests/dnd/test_moveable.html
  175. +83 −0 desktop/dojo/dojo/tests/dnd/test_moveable_markup.html
  176. +61 −0 desktop/dojo/dojo/tests/dnd/test_params.html
  177. +15 −15 desktop/dojo/dojo/tests/dnd/test_selector.html
  178. +71 −0 desktop/dojo/dojo/tests/dnd/test_selector_markup.html
  179. +2 −1 desktop/dojo/dojo/tests/module.js
  180. +4 −9 desktop/dojo/dojo/tests/number.js
  181. +22 −3 desktop/dojo/dojo/tests/parser.html
  182. +7 −0 desktop/dojo/dojo/tests/string.js
  183. +9 −0 desktop/dojo/dojox/_sql/LICENSE
  184. +443 −0 desktop/dojo/dojox/_sql/_crypto.js
  185. +28 −13 desktop/dojo/dojox/_sql/common.js
  186. +157 −91 desktop/dojo/dojox/_sql/demos/customers/customers.html
  187. +0 −4 desktop/dojo/dojox/crypto/LICENSE
  188. +258 −0 desktop/dojo/dojox/data/FlickrStore.js
  189. +87 −57 desktop/dojo/dojox/data/XmlStore.js
  190. +199 −0 desktop/dojo/dojox/data/demos/demo_FlickrStore.html
  191. +49 −0 desktop/dojo/dojox/data/demos/demo_FlickrStoreTree.html
  192. +2 −2 desktop/dojo/dojox/data/demos/demo_LazyLoad.html
  193. +35 −0 desktop/dojo/dojox/data/demos/flickrDemo.css
  194. +16 −16 desktop/dojo/dojox/data/demos/geography/root.json
  195. +8 −8 desktop/dojo/dojox/data/demos/stores/LazyLoadJSIStore.js
  196. +39 −0 desktop/dojo/dojox/data/demos/widgets/FlickrView.js
  197. +40 −0 desktop/dojo/dojox/data/demos/widgets/FlickrViewList.js
  198. +34 −0 desktop/dojo/dojox/data/demos/widgets/templates/FlickrView.html
  199. +2 −0 desktop/dojo/dojox/data/demos/widgets/templates/FlickrViewList.html
  200. +1 −0 desktop/dojo/dojox/data/tests/module.js
  201. +410 −0 desktop/dojo/dojox/data/tests/stores/FlickrStore.js
  202. +32 −50 desktop/dojo/dojox/gfx/demos/butterfly.html
  203. +32 −50 desktop/dojo/dojox/gfx/demos/lion.html
  204. +32 −50 desktop/dojo/dojox/gfx/demos/tiger.html
  205. +1 −1 desktop/dojo/dojox/gfx/shape.js
  206. +12 −3 desktop/dojo/dojox/gfx/tests/test_linearGradient.html
  207. +215 −18 desktop/dojo/dojox/layout/FloatingPane.js
  208. +6 −3 desktop/dojo/dojox/layout/README
  209. +242 −0 desktop/dojo/dojox/layout/ResizeHandle.js
  210. +78 −0 desktop/dojo/dojox/layout/resources/FloatingPane.css
  211. +8 −4 desktop/dojo/dojox/layout/resources/FloatingPane.html
  212. +32 −0 desktop/dojo/dojox/layout/resources/ResizeHandle.css
  213. BIN desktop/dojo/dojox/layout/resources/icons/down.png
  214. BIN desktop/dojo/dojox/layout/resources/icons/resize.png
  215. BIN desktop/dojo/dojox/layout/resources/icons/tabClose.png
  216. BIN desktop/dojo/dojox/layout/resources/icons/up.png
  217. BIN desktop/dojo/dojox/layout/tests/images/dojoLogo.png
  218. BIN desktop/dojo/dojox/layout/tests/images/gridUnderlay.png
  219. +56 −10 desktop/dojo/dojox/layout/tests/test_FloatingPane.html
  220. +99 −0 desktop/dojo/dojox/layout/tests/test_ResizeHandle.html
  221. +170 −0 desktop/dojo/dojox/layout/tests/test_SizingPane.html
  222. +1 −0 desktop/dojo/dojox/off/README
  223. +54 −29 desktop/dojo/dojox/off/_common.js
  224. +1 −0 desktop/dojo/dojox/off/demos/editor/editor.html
  225. +16 −9 desktop/dojo/dojox/off/demos/editor/editor.js
  226. +1 −0 desktop/dojo/dojox/off/demos/editor/version.js
  227. +7 −12 desktop/dojo/dojox/off/demos/helloworld/helloworld.html
  228. +1 −0 desktop/dojo/dojox/off/demos/helloworld/version.js
  229. +10 −0 desktop/dojo/dojox/off/docs/bookmarklets.html
  230. +118 −47 desktop/dojo/dojox/off/files.js
  231. +19 −3 desktop/dojo/dojox/off/offline.js
  232. +4,084 −0 desktop/dojo/dojox/off/offline.js.uncompressed.js
  233. +5 −3 desktop/dojo/dojox/off/sync.js
  234. +17 −3 desktop/dojo/dojox/off/ui.js
  235. +133 −117 desktop/dojo/dojox/presentation/SlideShow.js
  236. +93 −79 desktop/dojo/dojox/presentation/_base.js
  237. +9 −6 desktop/dojo/dojox/presentation/resources/Show.css
  238. +2 −2 desktop/dojo/dojox/presentation/resources/Show.html
  239. +12 −0 desktop/dojo/dojox/presentation/resources/SlideShow.css
  240. +4 −5 desktop/dojo/dojox/presentation/resources/SlideShow.html
  241. +11 −17 desktop/dojo/dojox/presentation/tests/test_SlideShow.html
  242. +5 −1 desktop/dojo/dojox/storage/GearsStorageProvider.js
  243. +2 −4 desktop/dojo/dojox/storage/_common.js
  244. +6 −0 desktop/dojo/dojox/storage/manager.js
  245. +18 −31 desktop/dojo/dojox/string/Builder.js
  246. +403 −0 desktop/dojo/dojox/string/tests/BuilderPerf.html
  247. +260 −0 desktop/dojo/dojox/string/tests/PerfFun.html
  248. +133 −0 desktop/dojo/dojox/string/tests/lipsum.js
  249. +153 −0 desktop/dojo/dojox/string/tests/notes.txt
  250. +78 −0 desktop/dojo/dojox/string/tests/peller.html
  251. +1 −0 desktop/dojo/dojox/uuid/Uuid.js
  252. +6 −0 desktop/dojo/dojox/validate.js
  253. +35 −0 desktop/dojo/dojox/validate/README
  254. +193 −0 desktop/dojo/dojox/validate/_base.js
  255. +45 −0 desktop/dojo/dojox/validate/ca.js
  256. +257 −0 desktop/dojo/dojox/validate/check.js
  257. +95 −0 desktop/dojo/dojox/validate/creditCard.js
  258. +329 −0 desktop/dojo/dojox/validate/regexp.js
  259. +119 −0 desktop/dojo/dojox/validate/tests/creditcard.js
  260. +14 −0 desktop/dojo/dojox/validate/tests/module.js
  261. +9 −0 desktop/dojo/dojox/validate/tests/runTests.html
  262. +524 −0 desktop/dojo/dojox/validate/tests/validate.js
  263. +67 −0 desktop/dojo/dojox/validate/us.js
  264. +89 −0 desktop/dojo/dojox/validate/web.js
  265. +106 −0 desktop/dojo/dojox/widget/Loader.js
  266. +27 −0 desktop/dojo/dojox/widget/Loader/Loader.css
  267. +39 −0 desktop/dojo/dojox/widget/Loader/README
  268. +27 −0 desktop/dojo/dojox/widget/Loader/honey.php
  269. BIN desktop/dojo/dojox/widget/Loader/icons/loading.gif
  270. +18 −20 desktop/dojo/dojox/widget/Toaster.js
  271. +27 −0 desktop/dojo/dojox/widget/Toaster/Toaster.css
  272. +81 −0 desktop/dojo/dojox/widget/tests/test_Loader.html
  273. +1 −0 desktop/dojo/dojox/widget/tests/test_Toaster.html
  274. +33 −6 desktop/dojo/dojox/wire/Wire.js
  275. +10 −10 desktop/dojo/dojox/wire/demos/markup/countries.json
  276. +2 −2 desktop/dojo/dojox/wire/demos/markup/demo_ActionWiring.html
  277. +3 −3 desktop/dojo/dojox/wire/demos/markup/demo_BasicChildWire.html
  278. +2 −2 desktop/dojo/dojox/wire/demos/markup/demo_BasicColumnWiring.html
  279. +281 −0 desktop/dojo/dojox/wire/demos/markup/demo_FlickrStoreWire.html
  280. +35 −0 desktop/dojo/dojox/wire/demos/markup/flickrDemo.css
  281. +0 −1 desktop/dojo/dojox/wire/ml/util.js
  282. +12 −0 desktop/dojo/dojox/wire/tests/programmatic/ConverterDynamic.js
  283. +45 −2 desktop/dojo/dojox/wire/tests/programmatic/Wire.js
  284. +44 −32 desktop/dojo/util/doh/runner.js
  285. +97 −0 install/database.sql
  286. BIN install/gradient.gif
  287. +66 −0 install/index.php
  288. +14 −0 install/install.js
  289. +26 −0 install/style.css
@@ -2,8 +2,6 @@ if(!dojo._hasResource["dijit.ColorPalette"]){
dojo._hasResource["dijit.ColorPalette"] = true;
dojo.provide("dijit.ColorPalette");
-dojo.require("dijit.util.place");
-dojo.require("dijit.util.typematic");
dojo.require("dijit._Widget");
dojo.require("dijit._Templated");
@@ -28,9 +26,9 @@ dojo.declare(
// Size of grid, either "7x10" or "3x4".
palette: "7x10",
- //_selectedColor: String
+ //_value: String
// The value of the selected color.
- selectedColor: null,
+ value: null,
//_currentFocus: Integer
// Index of the currently focused color.
@@ -106,17 +104,16 @@ dojo.declare(
highlightNode.alt = highlightNode.color = color;
var highlightStyle = highlightNode.style;
highlightStyle.color = highlightStyle.backgroundColor = "#" + color;
- dojo.forEach(["onMouseOver", "onBlur", "onFocus", "onKeyDown"], function(handler){
- this.connect(highlightNode, handler.toLowerCase(), handler);
+ dojo.forEach(["MouseDown", "MouseOut", "MouseOver", "Blur", "Focus", "KeyDown"], function(handler){
+ this.connect(highlightNode, "on"+handler.toLowerCase(), "_onColor"+handler);
}, this);
- this.connect(highlightNode, "onmousedown", "onClick");
this.divNode.appendChild(highlightNode);
var coords = this._paletteCoords;
highlightStyle.top = coords.topOffset + (row * coords.cHeight) + "px";
highlightStyle.left = coords.leftOffset + (col * coords.cWidth) + "px";
highlightNode.setAttribute("tabIndex","-1");
highlightNode.title = color+ " "; //color name will go here
- dijit.util.wai.setAttr(highlightNode, "waiRole", "role", "td");
+ dijit.wai.setAttr(highlightNode, "waiRole", "role", "td");
highlightNode.index = this._highlightNodes.length;
this._highlightNodes.push(highlightNode);
}
@@ -140,7 +137,7 @@ dojo.declare(
LEFT_ARROW: -1
};
for(var key in keyIncrementMap){
- dijit.util.typematic.addKeyListener(this.domNode,
+ dijit.typematic.addKeyListener(this.domNode,
{keyCode:dojo.keys[key], ctrlKey:false, altKey:false, shiftKey:false},
this,
function(){
@@ -151,49 +148,64 @@ dojo.declare(
}
},
- onColorSelect: function(color){
+ focus: function(){
+ // summary:
+ // Focus this ColorPalette.
+ dijit.focus(this._highlightNodes[this._currentFocus]);
+ },
+
+ onChange: function(color){
// summary:
// Callback when a color is selected.
// color: String
// Hex value corresponding to color.
console.debug("Color selected is: "+color);
},
- onClick: function(/*Event*/ evt){
+ _onColorMouseDown: function(/*Event*/ evt){
// summary:
- // Handler when a mouse click occurs. This causes the color that is clicked to be selected.
+ // Handler for onMouseDown. Selects the color.
// evt:
- // The click event.
+ // The mouse event.
var target = evt.currentTarget;
this._currentFocus = target.index;
- target.focus();
+ dijit.focus(target);
this._selectColor(target);
},
- onMouseOver: function(evt){
+ _onColorMouseOut: function(/*Event*/ evt){
+ // summary:
+ // Handler for onMouseOut. Removes highlight.
+ // evt:
+ // The mouse event.
+ dojo.removeClass(evt.currentTarget, "dijitPaletteImgHighlight");
+ },
+
+ _onColorMouseOver: function(/*Event*/ evt){
// summary:
- // Handler for onMouseOver. This changes the color being highlighted.
+ // Handler for onMouseOver. Highlights the color.
// evt:
// The mouse event.
var target = evt.currentTarget;
target.tabIndex = 0;
target.focus();
},
- onBlur: function(evt){
+ _onColorBlur: function(/*Event*/ evt){
// summary:
- // Handler for the onBlur event. Causes the highlight Div
- // to be destroyed.
+ // Handler for onBlur. Removes highlight and sets
+ // the first color as the palette's tab point.
// evt:
// The blur event.
dojo.removeClass(evt.currentTarget, "dijitPaletteImgHighlight");
+ evt.currentTarget.tabIndex = -1;
+ this._currentFocus = 0;
+ this._highlightNodes[0].tabIndex = 0;
},
- onFocus: function(evt){
+ _onColorFocus: function(/*Event*/ evt){
// summary:
- // Handler for onFocus. This highlights the first color in the
- // palette if it is the first time the palette is focused.
- // Otherwise the last color highlighted is focused.
+ // Handler for onFocus. Highlights the color.
// evt:
// The focus event.
if(this._currentFocus != evt.currentTarget.index){
@@ -204,12 +216,10 @@ dojo.declare(
},
- onKeyDown: function(evt){
+ _onColorKeyDown: function(/*Event*/ evt){
// summary:
// Handler for the onKeyDown event.
- // It handles space and tab being pressed.
// Space selects the color currently highlighted.
- // Tab blurs the area currently highlighted.
// evt:
// The keydown event.
@@ -220,11 +230,11 @@ dojo.declare(
_selectColor: function(selectNode){
// summary:
- // This selects a color. It triggers the onColorSelect event
+ // This selects a color. It triggers the onChange event
// area:
// The area node that covers the color being selected.
- this.selectedColor = selectNode.color;
- this.onColorSelect(selectNode.color);
+ this.value = selectNode.color;
+ this.onChange(selectNode.color);
},
_navigateByKey: function(increment, typeCount){
@@ -28,8 +28,8 @@ dojo.declare(
}
this.mixins.push(function(){
scripts.forEach(function(script){
- dojo.parser._wireUpConnect(this, script);
- });
+ dojo.parser._wireUpMethod(this, script);
+ }, this);
});
var propList = this.defaults||{};
@@ -5,11 +5,9 @@ dojo.provide("dijit.Dialog");
dojo.require("dojo.dnd.move");
dojo.require("dojo.fx");
-dojo.require("dijit.util.place");
-dojo.require("dijit.util.sniff");
-dojo.require("dijit.util.popup"); // for BackgroundIFrame
-dojo.require("dijit.layout.ContentPane");
+dojo.require("dijit._Widget");
dojo.require("dijit._Templated");
+dojo.require("dijit.layout.ContentPane");
dojo.declare(
"dijit.DialogUnderlay",
@@ -24,7 +22,7 @@ dojo.declare(
postCreate: function(){
var b = dojo.body();
b.appendChild(this.domNode);
- this.bgIframe = new dijit.util.BackgroundIframe(this.domNode);
+ this.bgIframe = new dijit.BackgroundIframe(this.domNode);
},
layout: function(){
@@ -33,7 +31,7 @@ dojo.declare(
// of the document) since we need to cover the whole browser window, even
// if the document is only a few lines long.
- var viewport = dijit.util.getViewport();
+ var viewport = dijit.getViewport();
var is = this.node.style,
os = this.domNode.style;
@@ -44,7 +42,7 @@ dojo.declare(
// process twice since the scroll bar may have been removed
// by the previous resizing
- var viewport2 = dijit.util.getViewport();
+ var viewport2 = dijit.getViewport();
if(viewport.w != viewport2.w){ is.width = viewport2.w + "px"; }
if(viewport.h != viewport2.h){ is.height = viewport2.h + "px"; }
},
@@ -82,7 +80,7 @@ dojo.declare(
// and also graying out the screen Dialog is extended from
// ContentPane so it supports all the same parameters (href, etc.)
- templateString:"<div class=\"dijitDialog\">\n\t\t<div dojoAttachPoint=\"titleBar\" class=\"dijitDialogTitleBar\" tabindex=\"0\" waiRole=\"dialog\" title=\"${title}\">\n\t\t<span dojoAttachPoint=\"titleNode\" class=\"dijitDialogTitle\">${title}</span>\n\t\t<span dojoAttachPoint=\"closeButtonNode\" class=\"dijitDialogCloseIcon\" dojoAttachEvent=\"onclick: hide\">\n\t\t\t<span dojoAttachPoint=\"closeText\" class=\"closeText\">x</span>\n\t\t</span>\n\t</div>\n\t\t<div dojoAttachPoint=\"containerNode\" class=\"dijitTitlePaneContent\"></div>\n\t<span dojoAttachPoint=\"tabEnd\" dojoAttachEvent=\"onfocus:_cycleFocus;\" tabindex=\"0\"></span>\n</div>\n",
+ templateString:"<div class=\"dijitDialog\">\n\t\t<div dojoAttachPoint=\"titleBar\" class=\"dijitDialogTitleBar\" tabindex=\"0\" waiRole=\"dialog\" title=\"${title}\">\n\t\t<span dojoAttachPoint=\"titleNode\" class=\"dijitDialogTitle\">${title}</span>\n\t\t<span dojoAttachPoint=\"closeButtonNode\" class=\"dijitDialogCloseIcon\" dojoAttachEvent=\"onclick: hide\">\n\t\t\t<span dojoAttachPoint=\"closeText\" class=\"closeText\">x</span>\n\t\t</span>\n\t</div>\n\t\t<div dojoAttachPoint=\"containerNode\" class=\"dijitDialogPaneContent\"></div>\n\t<span dojoAttachPoint=\"tabEnd\" dojoAttachEvent=\"onfocus:_cycleFocus\" tabindex=\"0\"></span>\n</div>\n",
// title: String
// Title of the dialog
@@ -106,6 +104,7 @@ dojo.declare(
var closeNode = dojo.byId(this.closeNode);
this.connect(closeNode, "onclick", "hide");
}
+ dijit.Dialog.superclass.startup.apply(this, arguments);// makes preload=true possible
},
onLoad: function(){
@@ -169,7 +168,7 @@ dojo.declare(
_position: function(){
// summary: position modal dialog in center of screen
- var viewport = dijit.util.getViewport();
+ var viewport = dijit.getViewport();
var mb = dojo.marginBox(this.domNode);
var style = this.domNode.style;
@@ -256,13 +255,11 @@ dojo.declare(
this._fadeIn.play();
- this._savedFocus = dijit.util.focus.save(this);
+ this._savedFocus = dijit.getFocus(this);
// set timeout to allow the browser to render dialog
setTimeout(dojo.hitch(this, function(){
- try{
- this.titleBar.focus();
- }catch(e){/*squelch*/}
+ dijit.focus(this.titleBar);
}), 50);
},
@@ -285,8 +282,10 @@ dojo.declare(
}
dojo.forEach(this._modalconnects, dojo.disconnect);
this._modalconnects = [];
-
- dijit.util.focus.restore(this._savedFocus);
+
+ // TODO: this is failing on FF presumably because the DialogUnderlay hasn't disappeared yet?
+ // Attach it to fire at the end of the animation
+ dijit.focus(this._savedFocus);
},
layout: function() {
@@ -305,17 +304,29 @@ dojo.declare(
// summary:
// Pops up a dialog that appears like a Tooltip
- // closeNode: String
- // Id of button or other dom node to click to close this dialog
- closeNode: "",
+ // submitNode: String
+ // Id of button or other dom node to click to submit this dialog
+ submitNode: "",
+
+ // cancelNode: String
+ // Id of button or other dom node to click to cancel this dialog
+ cancelNode: "",
// title: String
// Description of tooltip dialog (required for a11Y)
title: "",
-
+
+ // onCancel: Function
+ // Callback when user has canceled dialog
+ onCancel: function(){},
+
+ // onExecute: Function
+ // Callback when user has executed dialog
+ onExecute: function(){},
+
_lastFocusItem: null,
- templateString:"<div id=\"${id}\" class=\"dijitTooltipDialog\" >\n\t<div class=\"dijitTooltipContainer dijitTooltipContents\" dojoAttachPoint=\"containerNode\" tabindex=\"0\" waiRole=\"dialog\"></div>\n\t<span dojoAttachPoint=\"tabEnd\" tabindex=\"0\" dojoAttachEvent=\"focus:_cycleFocus\"></span>\n\t<div class=\"dijitTooltipConnector\" ></div>\n</div>\n",
+ templateString:"<div id=\"${id}\" class=\"dijitTooltipDialog\" >\n\t<div class=\"dijitTooltipContainer\">\n\t\t<div class =\"dijitTooltipContents dijitTooltipFocusNode\" dojoAttachPoint=\"containerNode\" tabindex=\"0\" waiRole=\"dialog\"></div>\n\t</div>\n\t<span dojoAttachPoint=\"tabEnd\" tabindex=\"0\" dojoAttachEvent=\"focus:_cycleFocus\"></span>\n\t<div class=\"dijitTooltipConnector\" ></div>\n</div>\n",
postCreate: function(){
dijit.TooltipDialog.superclass.postCreate.apply(this, arguments);
@@ -325,31 +336,31 @@ dojo.declare(
var ev = typeof(document.ondeactivate) == "object" ? "ondeactivate" : "onblur";
this.connect(this.containerNode, ev, "_findLastFocus");
this.containerNode.title=this.title;
- },
-
- startup: function(){
- if(this.closeNode){
- var closeNode = dojo.byId(this.closeNode);
- this.connect(closeNode, "onclick", "_hide");
+ },
+
+ startup: function(){
+ if(this.cancelNode){
+ var cancelNode = dojo.byId(this.cancelNode);
+ this.connect(cancelNode, "onclick", "onCancel");
+ }
+ if(this.submitNode){
+ var submitNode = dojo.byId(this.submitNode);
+ this.connect(submitNode, "onclick", "onExecute");
}
+ dijit.TooltipDialog.superclass.startup.apply(this, arguments);// makes preload=true possible
},
onOpen: function(/*Object*/ pos){
// summary: called when dialog is displayed, with info on where it's being displayed relative to the button
this.domNode.className="dijitTooltipDialog dijitTooltip" + (pos.corner=='TL' ? "Below" : "Above");
-
+ this._loadCheck(); // lazy load trigger
this.containerNode.focus();
},
- _hide: function(){
- // summary: hide the dialog
- dijit.util.popup.closeAll();
- },
-
_onKey: function(/*Event*/ evt){
//summary: keep keyboard focus in dialog; close dialog on escape key
if (evt.keyCode == dojo.keys.ESCAPE){
- this._hide();
+ this.onCancel();
}else if (evt.target == this.containerNode && evt.shiftKey && evt.keyCode == dojo.keys.TAB){
if (this._lastFocusItem){
this._lastFocusItem.focus();
@@ -6,7 +6,7 @@ dojo.require("dijit.Toolbar");
dojo.require("dijit._Container");
dojo.require("dijit._editor.plugins.DefaultToolbar");
dojo.require("dojo.i18n");
-dojo.requireLocalization("dijit._editor", "commands", null, "it,ROOT,de");
+dojo.requireLocalization("dijit._editor", "commands", null, "ROOT,it,de");
dojo.declare(
"dijit.Editor",
Oops, something went wrong.

0 comments on commit 81b27f3

Please sign in to comment.