Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into grid

Conflicts:
	tests/visual/menu/menu.html
  • Loading branch information...
commit 6c2e4b3b5ea7cd27e2de0758a18c82224b6a7179 2 parents 7608f44 + f4e4727
Jörn Zaefferer jzaefferer authored
Showing with 20,682 additions and 16,185 deletions.
  1. +13 −0 .editorconfig
  2. +2 −3 .gitignore
  3. +12 −0 .jshintrc
  4. +201 −30 AUTHORS.txt
  5. +2 −1  MIT-LICENSE.txt
  6. +69 −8 README.md
  7. +0 −373 build/build.xml
  8. BIN  build/build/ant-contrib-0.6.jar
  9. +0 −5,504 build/build/lib/jslint.js
  10. +0 −1,315 build/build/lib/parse-js.js
  11. +0 −1,666 build/build/lib/process.js
  12. +0 −22 build/build/lib/squeeze-more.js
  13. +0 −3  build/build/minify-js.sh
  14. +0 −41 build/build/sizer.js
  15. +0 −211 build/build/style.xsl
  16. +0 −285 build/build/uglify.js
  17. BIN  build/build/yuicompressor-2.4.2.jar
  18. +67 −0 build/core.json
  19. +38 −0 build/effect.json
  20. +36 −0 build/interaction.json
  21. +0 −336 build/release/prepare-release
  22. +399 −0 build/release/release.js
  23. +267 −0 build/tasks/build.js
  24. +79 −0 build/tasks/testswarm.js
  25. +98 −0 build/widget.json
  26. +1 −1  demos/accordion/collapsible.html
  27. +7 −5 demos/accordion/custom-icons.html
  28. +1 −1  demos/accordion/default.html
  29. +1 −1  demos/accordion/fillspace.html
  30. +1 −1  demos/accordion/hoverintent.html
  31. +1 −1  demos/accordion/no-auto-height.html
  32. +1 −1  demos/accordion/sortable.html
  33. +2 −2 demos/addClass/default.html
  34. +8 −7 demos/animate/default.html
  35. +1 −1  demos/autocomplete/categories.html
  36. +29 −17 demos/autocomplete/combobox.html
  37. +2 −2 demos/autocomplete/custom-data.html
  38. +1 −1  demos/autocomplete/default.html
  39. +1 −1  demos/autocomplete/folding.html
  40. +1 −3 demos/autocomplete/maxheight.html
  41. +1 −1  demos/autocomplete/multiple-remote.html
  42. +1 −1  demos/autocomplete/multiple.html
  43. +1 −1  demos/autocomplete/remote-jsonp.html
  44. +1 −1  demos/autocomplete/remote-with-cache.html
  45. +1 −1  demos/autocomplete/remote.html
  46. +1 −1  demos/autocomplete/xml.html
  47. +1 −1  demos/button/checkbox.html
  48. +3 −3 demos/button/default.html
  49. +1 −1  demos/button/icons.html
  50. +1 −1  demos/button/radio.html
  51. +1 −1  demos/button/splitbutton.html
  52. +1 −1  demos/button/toolbar.html
  53. +1 −1  demos/datepicker/alt-field.html
  54. +8 −8 demos/datepicker/animation.html
  55. +1 −1  demos/datepicker/buttonbar.html
  56. +1 −1  demos/datepicker/date-formats.html
  57. +11 −9 demos/datepicker/date-range.html
  58. +1 −1  demos/datepicker/default.html
  59. +1 −1  demos/datepicker/dropdown-month-year.html
  60. +1 −1  demos/datepicker/icon-trigger.html
  61. +1 −1  demos/datepicker/inline.html
  62. +3 −1 demos/datepicker/localization.html
  63. +1 −1  demos/datepicker/min-max.html
  64. +1 −1  demos/datepicker/multiple-calendars.html
  65. +1 −1  demos/datepicker/other-months.html
  66. +1 −1  demos/datepicker/show-week.html
  67. +2 −0  demos/demos.css
  68. +4 −4 demos/dialog/animated.html
  69. +1 −1  demos/dialog/default.html
  70. +1 −1  demos/dialog/modal-confirmation.html
  71. +2 −2 demos/dialog/modal-form.html
  72. +1 −1  demos/dialog/modal-message.html
  73. +1 −1  demos/dialog/modal.html
  74. +1 −1  demos/draggable/constrain-movement.html
  75. +1 −1  demos/draggable/cursor-style.html
  76. +1 −1  demos/draggable/default.html
  77. +1 −1  demos/draggable/delay-start.html
  78. +1 −1  demos/draggable/events.html
  79. +1 −1  demos/draggable/handle.html
  80. +1 −1  demos/draggable/revert.html
  81. +1 −1  demos/draggable/scroll.html
  82. +3 −3 demos/draggable/snap-to.html
  83. +1 −1  demos/draggable/sortable.html
  84. +1 −1  demos/draggable/visual-feedback.html
  85. +1 −1  demos/droppable/accepted-elements.html
  86. +1 −1  demos/droppable/default.html
  87. +1 −1  demos/droppable/photo-manager.html
  88. +1 −1  demos/droppable/propagation.html
  89. +1 −1  demos/droppable/revert.html
  90. +7 −7 demos/droppable/shopping-cart.html
  91. +1 −1  demos/droppable/visual-feedback.html
  92. +15 −15 demos/effect/default.html
  93. +2 −2 demos/effect/easing.html
  94. +13 −13 demos/hide/default.html
  95. +16 −15 demos/index.html
  96. +9 −14 demos/menu/default.html
  97. +3 −4 demos/menu/index.html
  98. +10 −13 demos/menu/navigationmenu.html
  99. +16 −12 demos/menu/topalignmenu.html
  100. +4 −4 demos/position/cycler.html
  101. +7 −32 demos/position/default.html
  102. +2 −2 demos/progressbar/animated.html
  103. +1 −1  demos/progressbar/default.html
  104. +1 −1  demos/progressbar/resize.html
  105. +2 −2 demos/removeClass/default.html
  106. +1 −1  demos/resizable/animate.html
  107. +1 −1  demos/resizable/aspect-ratio.html
  108. +1 −1  demos/resizable/constrain-area.html
  109. +1 −1  demos/resizable/default.html
  110. +1 −1  demos/resizable/delay-start.html
  111. +1 −1  demos/resizable/helper.html
  112. +1 −1  demos/resizable/max-min.html
  113. +1 −1  demos/resizable/snap-to-grid.html
  114. +1 −1  demos/resizable/synchronous-resize.html
  115. +1 −1  demos/resizable/textarea.html
  116. +1 −1  demos/resizable/visual-feedback.html
  117. +1 −1  demos/selectable/default.html
  118. +1 −1  demos/selectable/display-grid.html
  119. +1 −1  demos/selectable/serialize.html
  120. +13 −13 demos/show/default.html
  121. +1 −1  demos/slider/colorpicker.html
  122. +1 −1  demos/slider/default.html
  123. +1 −1  demos/slider/hotelrooms.html
  124. +1 −1  demos/slider/multiple-vertical.html
  125. +1 −1  demos/slider/range-vertical.html
  126. +1 −1  demos/slider/range.html
  127. +1 −1  demos/slider/rangemax.html
  128. +1 −1  demos/slider/rangemin.html
  129. +1 −1  demos/slider/side-scroll.html
  130. +1 −1  demos/slider/slider-vertical.html
  131. +1 −1  demos/slider/steps.html
  132. +1 −1  demos/slider/tabs.html
  133. +1 −1  demos/sortable/connect-lists-through-tabs.html
  134. +1 −1  demos/sortable/connect-lists.html
  135. +1 −1  demos/sortable/default.html
  136. +1 −1  demos/sortable/delay-start.html
  137. +1 −1  demos/sortable/display-grid.html
  138. +2 −2 demos/sortable/empty-lists.html
  139. +1 −1  demos/sortable/items.html
  140. +1 −1  demos/sortable/placeholder.html
  141. +1 −1  demos/sortable/portlets.html
  142. +3 −3 demos/spinner/currency.html
  143. +2 −2 demos/spinner/decimal.html
  144. +15 −11 demos/spinner/default.html
  145. +2 −2 demos/spinner/latlong.html
  146. +2 −2 demos/spinner/overflow.html
  147. +2 −2 demos/spinner/time.html
  148. +2 −2 demos/switchClass/default.html
  149. +1 −1  demos/tabs/ajax.html
  150. +1 −1  demos/tabs/bottom.html
  151. +1 −1  demos/tabs/collapsible.html
  152. +0 −57 demos/tabs/cookie.html
  153. +1 −1  demos/tabs/default.html
  154. +0 −1  demos/tabs/index.html
  155. +3 −3 demos/tabs/manipulation.html
  156. +1 −1  demos/tabs/mouseover.html
  157. +1 −1  demos/tabs/sortable.html
  158. +1 −1  demos/tabs/vertical.html
  159. +37 −22 demos/toggle/default.html
  160. +2 −2 demos/toggleClass/default.html
  161. +3 −3 demos/tooltip/custom-animation.html
  162. +7 −5 demos/tooltip/custom-content.html
  163. +47 −56 demos/tooltip/custom-style.html
  164. +1 −1  demos/tooltip/default.html
  165. +10 −25 demos/tooltip/forms.html
  166. +2 −19 demos/tooltip/tracking.html
  167. +3 −3 demos/tooltip/video-player.html
  168. +11 −8 demos/widget/default.html
  169. +20 −14 external/{jquery.mousewheel-3.0.4.js → jquery.mousewheel.js}
  170. +4,390 −0 external/jshint.js
  171. +21 −22 external/qunit.css
  172. +1,012 −739 external/qunit.js
  173. +354 −0 grunt.js
  174. +654 −516 jquery-1.7.1.js → jquery-1.7.2.js
  175. +66 −0 package.json
  176. +59 −0 tests/.jshintrc
  177. +21 −0 tests/index.css
  178. +23 −12 tests/index.html
  179. +10 −0 tests/index.js
  180. +9,404 −0 tests/jquery-1.7.2.js
  181. +1 −1  tests/jquery.js
  182. +2 −2 tests/jquery.simulate.js
  183. +0 −39 tests/resource_loader.js
  184. +0 −161 tests/static/button/default.html
  185. +0 −1,367 tests/static/datepicker/datepicker.html
  186. +0 −86 tests/static/datepicker/default.html
  187. +0 −246 tests/static/icons.html
  188. +0 −1  tests/static/static.css
  189. +0 −9 tests/static/static.js
  190. +10 −12 tests/unit/accordion/accordion.html
  191. +1 −1  tests/unit/accordion/{accordion_defaults.js → accordion_common.js}
  192. +1 −1  tests/unit/accordion/{accordion_defaults_deprecated.js → accordion_common_deprecated.js}
  193. +88 −19 tests/unit/accordion/accordion_core.js
  194. +10 −12 tests/unit/accordion/accordion_deprecated.html
  195. +87 −83 tests/unit/accordion/accordion_deprecated.js
  196. +65 −62 tests/unit/accordion/accordion_events.js
  197. +16 −8 tests/unit/accordion/accordion_methods.js
  198. +217 −44 tests/unit/accordion/accordion_options.js
  199. +25 −28 tests/unit/accordion/accordion_test_helpers.js
  200. +3 −3 tests/unit/accordion/all.html
  201. +3 −3 tests/unit/all-active.html
  202. +3 −3 tests/unit/all.html
  203. +3 −3 tests/unit/autocomplete/all.html
  204. +6 −8 tests/unit/autocomplete/autocomplete.html
  205. +5 −1 tests/unit/autocomplete/{autocomplete_defaults.js → autocomplete_common.js}
  206. +66 −0 tests/unit/autocomplete/autocomplete_core.js
  207. +1 −1  tests/unit/autocomplete/autocomplete_events.js
  208. +3 −3 tests/unit/button/all.html
  209. +6 −8 tests/unit/button/button.html
  210. +1 −1  tests/unit/button/{button_defaults.js → button_common.js}
  211. +15 −8 tests/unit/button/button_core.js
  212. +4 −7 tests/unit/button/button_methods.js
  213. +13 −0 tests/unit/button/button_options.js
  214. +11 −6 tests/unit/button/button_tickets.js
  215. +3 −3 tests/unit/core/all.html
  216. +11 −15 tests/unit/core/core.html
  217. +58 −29 tests/unit/core/core.js
  218. +40 −40 tests/unit/core/selector.js
  219. +3 −3 tests/unit/datepicker/all.html
  220. +5 −7 tests/unit/datepicker/datepicker.html
  221. +95 −87 tests/unit/datepicker/datepicker_core.js
  222. +1 −1  tests/unit/datepicker/datepicker_defaults.js
  223. +28 −26 tests/unit/datepicker/datepicker_events.js
  224. +20 −16 tests/unit/datepicker/datepicker_methods.js
  225. +178 −166 tests/unit/datepicker/datepicker_options.js
  226. +11 −7 tests/unit/datepicker/datepicker_tickets.js
  227. +3 −3 tests/unit/dialog/all.html
  228. +6 −8 tests/unit/dialog/dialog.html
  229. +1 −1  tests/unit/dialog/{dialog_defaults.js → dialog_common.js}
  230. +8 −22 tests/unit/dialog/dialog_core.js
  231. +6 −4 tests/unit/dialog/dialog_events.js
  232. +17 −3 tests/unit/dialog/dialog_methods.js
  233. +56 −47 tests/unit/dialog/dialog_options.js
  234. +69 −16 tests/unit/dialog/dialog_tickets.js
  235. +3 −3 tests/unit/draggable/all.html
  236. +6 −8 tests/unit/draggable/draggable.html
  237. +32 −0 tests/unit/draggable/draggable_common.js
  238. +9 −9 tests/unit/draggable/draggable_core.js
  239. +0 −36 tests/unit/draggable/draggable_defaults.js
  240. +1 −1  tests/unit/draggable/draggable_events.js
  241. +39 −48 tests/unit/draggable/draggable_options.js
  242. +3 −3 tests/unit/droppable/all.html
  243. +6 −8 tests/unit/droppable/droppable.html
  244. +12 −0 tests/unit/droppable/droppable_common.js
  245. +5 −5 tests/unit/droppable/droppable_core.js
  246. +0 −16 tests/unit/droppable/droppable_defaults.js
  247. +0 −4 tests/unit/droppable/droppable_options.js
  248. +3 −3 tests/unit/effects/all.html
  249. +19 −20 tests/unit/effects/effects.html
  250. +85 −37 tests/unit/effects/effects_core.js
  251. +17 −17 tests/unit/effects/effects_scale.js
  252. +3 −33 tests/unit/index.html
  253. +3 −3 tests/unit/menu/all.html
  254. +28 −17 tests/unit/menu/menu.html
  255. +5 −1 tests/unit/menu/{menu_defaults.js → menu_common.js}
  256. +21 −32 tests/unit/menu/menu_core.js
  257. +342 −231 tests/unit/menu/menu_events.js
  258. +73 −31 tests/unit/menu/menu_methods.js
  259. +95 −21 tests/unit/menu/menu_options.js
  260. +29 −12 tests/unit/menu/menu_test_helpers.js
  261. +3 −3 tests/unit/position/all.html
  262. +19 −38 tests/unit/position/position.html
  263. +338 −196 tests/unit/position/position_core.js
  264. +0 −545 tests/unit/position/position_core_within.js
  265. +21 −33 tests/unit/position/position_deprecated.html
  266. +1 −0  tests/unit/position/position_deprecated.js
  267. +3 −3 tests/unit/progressbar/all.html
  268. +6 −8 tests/unit/progressbar/progressbar.html
  269. +1 −1  tests/unit/progressbar/{progressbar_defaults.js → progressbar_common.js}
  270. +14 −22 tests/unit/progressbar/progressbar_core.js
  271. +25 −33 tests/unit/progressbar/progressbar_events.js
  272. +12 −31 tests/unit/progressbar/progressbar_methods.js
  273. +30 −27 tests/unit/progressbar/progressbar_options.js
  274. +13 −0 tests/unit/qunit-composite.css
  275. +102 −0 tests/unit/qunit-composite.js
  276. +3 −3 tests/unit/resizable/all.html
  277. +7 −9 tests/unit/resizable/resizable.html
  278. +27 −0 tests/unit/resizable/resizable_common.js
  279. +0 −28 tests/unit/resizable/resizable_defaults.js
  280. +0 −12 tests/unit/resizable/resizable_events.js
  281. +0 −55 tests/unit/resizable/resizable_methods.js
  282. +9 −0 tests/unit/resizable/resizable_options.js
  283. +3 −3 tests/unit/selectable/all.html
  284. +6 −8 tests/unit/selectable/selectable.html
  285. +12 −0 tests/unit/selectable/selectable_common.js
  286. +0 −16 tests/unit/selectable/selectable_defaults.js
  287. +9 −7 tests/unit/selectable/selectable_methods.js
  288. +3 −3 tests/unit/selectable/selectable_options.js
  289. +3 −3 tests/unit/slider/all.html
  290. +6 −8 tests/unit/slider/slider.html
  291. +2 −2 tests/unit/slider/{slider_defaults.js → slider_common.js}
  292. +8 −0 tests/unit/slider/slider_core.js
  293. +2 −4 tests/unit/slider/slider_events.js
  294. +15 −18 tests/unit/slider/slider_methods.js
  295. +13 −9 tests/unit/slider/slider_options.js
  296. +3 −3 tests/unit/sortable/all.html
  297. +6 −8 tests/unit/sortable/sortable.html
  298. +30 −0 tests/unit/sortable/sortable_common.js
  299. +0 −34 tests/unit/sortable/sortable_defaults.js
  300. +32 −32 tests/unit/sortable/sortable_events.js
Sorry, we could not display the entire diff because too many files (464) changed.
13 .editorconfig
View
@@ -0,0 +1,13 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+
+[grunt.js]
+indent_style = tab
+
+[ui/**.js]
+indent_style = tab
+
+[tests/unit/**.js]
+indent_style = tab
5 .gitignore
View
@@ -1,6 +1,5 @@
-build/dist
-build/size
-build/build/.sizecache.json
+dist
+node_modules
docs
.project
*~
12 .jshintrc
View
@@ -0,0 +1,12 @@
+{
+ "curly": true,
+ "eqnull": true,
+ "eqeqeq": true,
+ "expr": true,
+ "latedef": true,
+ "noarg": true,
+ "onevar": true,
+ "smarttabs": true,
+ "trailing": true,
+ "undef": true
+}
231 AUTHORS.txt
View
@@ -1,31 +1,202 @@
-jQuery UI Authors (http://jqueryui.com/about)
+Authors ordered by first contribution
+A list of current team members is available at http://jqueryui.com/about
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-and logs, available at http://github.com/jquery/jquery-ui
-
-Brandon Aaron
-Paul Bakaus (paulbakaus.com)
-David Bolter
-Rich Caloggero
-Chi Cheng (cloudream@gmail.com)
-Colin Clark (http://colin.atrc.utoronto.ca/)
-Michelle D'Souza
-Aaron Eisenberger (aaronchi@gmail.com)
-Ariel Flesler
-Bohdan Ganicky
-Scott González
-Marc Grabanski (m@marcgrabanski.com)
-Klaus Hartl (stilbuero.de)
-Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
-Scott Jehl
-Cody Lindley
-Eduardo Lundgren (eduardolundgren@gmail.com)
-Todd Parker
-John Resig
-Patty Toland
-Ca-Phun Ung (yelotofu.com)
-Keith Wood (kbwood@virginbroadband.com.au)
-Maggie Costello Wachs
-Richard D. Worth (rdworth.org)
-Jörn Zaefferer (bassistance.de)
+Paul Bakaus <paul.bakaus@googlemail.com>
+Richard Worth <rdworth@gmail.com>
+Yehuda Katz <wycats@gmail.com>
+Sean Catchpole <littlecooldude@gmail.com>
+John Resig <jeresig@gmail.com>
+Tane Piper <tane@tanepiper.com>
+Dmitri Gaskin <dmitrig01@gmail.com>
+Klaus Hartl <klaus.hartl@googlemail.com>
+Stefan Petre <stefan.petre@gmail.com>
+Gilles van den Hoven <gilles@webunity.nl>
+Micheil Smith <micheil@brandedcode.com>
+Jörn Zaefferer <joern.zaefferer@gmail.com>
+Marc Grabanski <m@marcgrabanski.com>
+Keith Wood <kbwood.au@gmail.com>
+Brandon Aaron <brandon.aaron@gmail.com>
+Scott González <scott.gonzalez@gmail.com>
+Eduardo Lundgren <eduardolundgren@gmail.com>
+Aaron Eisenberger <aaronchi@gmail.com>
+Joan Piedra <theneojp@gmail.com>
+Bruno Basto <b.basto@gmail.com>
+Remy Sharp <remy@leftlogic.com>
+Bohdan Ganicky <bohdan.ganicky@gmail.com>
+David Bolter <david.bolter@gmail.com>
+Chi Cheng <cloudream@gmail.com>
+Ca-Phun Ung <pazu2k@gmail.com>
+Ariel Flesler <aflesler@gmail.com>
+Maggie Costello Wachs <fg.maggie@gmail.com>
+Scott Jehl <scott@scottjehl.com>
+Todd Parker <fg.todd@gmail.com>
+Andrew Powell <powella@gmail.com>
+Brant Burnett <btburnett3@gmail.com>
+Douglas Neiner <doug@pixelgraphics.us>
+Paul Irish <paul.irish@gmail.com>
+Ralph Whitbeck <ralph.whitbeck@gmail.com>
+Thibault Duplessis <thibault.duplessis@gmail.com>
+Dominique Vincent <dominique.vincent@toitl.com>
+Jack Hsu <jack.hsu@gmail.com>
+Adam Sontag <ajpiano@ajpiano.com>
+Carl Fürstenberg <carl@excito.com>
+Kevin Dalman <development@allpro.net>
+Alberto Fernández Capel <afcapel@gmail.com>
+Jacek Jędrzejewski (http://jacek.jedrzejewski.name)
+Ting Kuei <ting@kuei.com>
+Samuel Cormier-Iijima <sam@chide.it>
+Jon Palmer <jonspalmer@gmail.com>
+Ben Hollis <bhollis@amazon.com>
+Justin MacCarthy <Justin@Rubystars.biz>
+Eyal Kobrigo <kobrigo@hotmail.com>
+Tiago Freire <tiago.freire@gmail.com>
+Diego Tres <diegotres@gmail.com>
+Holger Rüprich <holger@rueprich.de>
+Ziling Zhao <zizhao@cisco.com>
+Mike Alsup <malsup@gmail.com>
+Robson Braga Araujo <robsonbraga@gmail.com>
+Pierre-Henri Ausseil <ph.ausseil@gmail.com>
+Christopher McCulloh <cmcculloh@gmail.com>
+Andrew Newcomb <ext.github@preceptsoftware.co.uk>
+Lim Chee Aun <cheeaun@gmail.com>
+Jorge Barreiro <yortx.barry@gmail.com>
+Daniel Steigerwald <daniel@steigerwald.cz>
+John Firebaugh <john_firebaugh@bigfix.com>
+John Enters <github@darkdark.net>
+Andrey Kapitcyn <ru.m157y@gmail.com>
+Dmitry Petrov <dpetroff@gmail.com>
+Eric Hynds <eric@hynds.net>
+Chairat Sunthornwiphat <pipo@sixhead.com>
+Josh Varner <josh.varner@gmail.com>
+Stéphane Raimbault <stephane.raimbault@gmail.com>
+Jay Merrifield <fracmak@gmail.com>
+J. Ryan Stinnett <jryans@gmail.com>
+Peter Heiberg <peter@heiberg.se>
+Alex Dovenmuehle <adovenmuehle@gmail.com>
+Jamie Gegerson <git@jamiegegerson.com>
+Raymond Schwartz <skeetergraphics@gmail.com>
+Phillip Barnes <philbar@gmail.com>
+Kyle Wilkinson <kai@wikyd.org>
+Khaled AlHourani <me@khaledalhourani.com>
+Marian Rudzynski <mr@impaled.org>
+Jean-Francois Remy <jfremy@virtuoz.com>
+Doug Blood <dougblood@gmail.com>
+Filippo Cavallarin <poplix@papuasia.org>
+Heiko Henning <h.henning@educa.ch>
+Aliaxandr Rahalevich <saksmlz@gmail.com>
+Mario Visic <mario@mariovisic.com>
+Xavi Ramirez <xavi.rmz@gmail.com>
+Max Schnur <max.schnur@gmail.com>
+Saji Nediyanchath <saji89@gmail.com>
+Corey Frang <gnarf@gnarf.net>
+Aaron Peterson <aaronp123@yahoo.com>
+Ivan Peters <ivan@ivanpeters.com>
+Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
+Marcos Sousa <marcos.sousa@corp.globo.com>
+Michael DellaNoce <mdellanoce@mailtrust.com>
+George Marshall <echosx@gmail.com>
+Tobias Brunner <tobias@strongswan.org>
+Martin Solli <msolli@gmail.com>
+David Petersen <public@petersendidit.com>
+Dan Heberden <danheberden@gmail.com>
+William Kevin Manire <williamkmanire@gmail.com>
+Gilmore Davidson <gilmoreorless@gmail.com>
+Michael Wu <michaelmwu@gmail.com>
+Adam Parod <mystic414@gmail.com>
+Guillaume Gautreau <guillaume+github@ghusse.com>
+Marcel Toele <EleotleCram@gmail.com>
+Dan Streetman <ddstreet@ieee.org>
+Matt Hoskins <furlined@cat-basket.org>
+Giovanni Giacobbi <giovanni@giacobbi.net>
+Kyle Florence <kyle.florence@gmail.com>
+Pavol Hluchý <lopo@losys.sk>
+Hans Hillen <hans.hillen@gmail.com>
+Mark Johnson <virgofx@live.com>
+Trey Hunner <treyhunner@gmail.com>
+Shane Whittet <whittet@gmail.com>
+Edward Faulkner <ef@alum.mit.edu>
+Adam Baratz <adam.baratz@gmail.com>
+Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
+Eike Send <eike.send@gmail.com>
+Kris Borchers <kris.borchers@gmail.com>
+Eddie Monge <eddie@eddiemonge.com>
+Israel Tsadok <itsadok@gmail.com>
+Carson McDonald <carson@ioncannon.net>
+Jason Davies <jason@jasondavies.com>
+Garrison Locke <gplocke@gmail.com>
+David Murdoch <musicisair@yahoo.com>
+Ben Boyle <benjamins.boyle@gmail.com>
+Jesse Baird <jebaird@gmail.com>
+Jonathan Vingiano <jvingiano@gmail.com>
+Dylan Just <dev@ephox.com>
+Tomy Kaira <tomykaira@gmail.com>
+Glenn Goodrich <glenn.goodrich@gmail.com>
+Ashek Elahi <mail.ashek@gmail.com>
+Ryan Neufeld <ryan@neufeldmail.com>
+Marc Neuwirth <marc.neuwirth@gmail.com>
+Philip Graham <philip.robert.graham@gmail.com>
+Benjamin Sterling <benjamin.sterling@kenzomedia.com>
+Wesley Walser <wwalser@atlassian.com>
+Kouhei Sutou <kou@clear-code.com>
+Karl Kirch <karl.ctr.kirch@faa.gov>
+Chris Kelly <ckdake@ckdake.com>
+Jay Oster <jay@loyalize.com>
+Alex Polomoshnov <alex.polomoshnov@gmail.com>
+David Leal <dgleal@gmail.com>
+igor milla <igor.fsp.milla@gmail.com>
+Dave Methvin <dave.methvin@gmail.com>
+Florian Gutmann <blackfeet@gmx.at>
+Marwan Al Jubeh <marwan.aljubeh@gmail.com>
+Milan Broum <midlis@googlemail.com>
+Sebastian Sauer <info@dynpages.de>
+Gaëtan Muller <m.gaetan89@gmail.com>
+Michel Weimerskirch <michel@weimerskirch.net>
+William Griffiths <william@ycymro.com>
+Stojce Slavkovski <stojce@gmail.com>
+David Soms <david.soms@gmail.com>
+David De Sloovere <david.desloovere@hotmail.com>
+Michael P. Jung <michael.jung@terreon.de>
+Shannon Pekary <spekary@gmail.com>
+Matthew Hutton <meh@corefiling.co.uk>
+James Khoury <james@jameskhoury.com>
+Rob Loach <robloach@gmail.com>
+Alberto Monteiro <betimbrasil@gmail.com>
+Alex Rhea <alex.rhea@gmail.com>
+Krzysztof Rosiński <rozwell69@gmail.com>
+Ryan Olton <oltonr@gmail.com>
+Genie <386@mail.com>
+Rick Waldron <waldron.rick@gmail.com>
+Ian Simpson <spoonlikesham@gmail.com>
+Lev Kitsis <spam4lev@gmail.com>
+TJ VanToll <tj.vantoll@gmail.com>
+Justin Domnitz <jdomnitz@gmail.com>
+Douglas Cerna <douglascerna@yahoo.com>
+Bert ter Heide <bertjh@hotmail.com>
+Jasvir Nagra <jasvir@gmail.com>
+Petr Hromadko <yuriy@tokyoscale.com>
+Harri Kilpiö <harri.kilpio@gmail.com>
+Lado Lomidze <lado.lomidze@gmail.com>
+Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
+Simon Sattes <simon.sattes@gmail.com>
+Jo Liss <joliss42@gmail.com>
+Guntupalli Karunakar <karunakarg@yahoo.com>
+Shahyar Ghobadpour <shahyar@gmail.com>
+Lukasz Lipinski <uzza17@gmail.com>
+Timo Tijhof <krinklemail@gmail.com>
+Jason Moon <jmoon@socialcast.com>
+Martin Frost <martinf55@hotmail.com>
+Eneko Illarramendi <eneko@illarra.com>
+EungJun Yi <semtlenori@gmail.com>
+Courtland Allen <courtlandallen@gmail.com>
+Viktar Varvanovich <non4eg@gmail.com>
+Danny Trunk <dtrunk90@googlemail.com>
+Pavel Stetina <pavel.stetina@nangu.tv>
+Mike Stay <metaweta@gmail.com>
+Steven Roussey <sroussey@gmail.com>
+Mike Hollis <hollis21@gmail.com>
+Lee Rowlands <lee.rowlands@previousnext.com.au>
+Timmy Willison <timmywillisn@gmail.com>
+Karl Swedberg <kswedberg@gmail.com>
+Baoju Yuan <the_guy_1987@hotmail.com>
+Maciej Mroziński <mrozik87@gmail.com>
+Luis Dalmolin <luis.nh@gmail.com>
3  MIT-LICENSE.txt
View
@@ -1,4 +1,5 @@
-Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
+Copyright 2012 jQuery Foundation and other contributors,
+http://jqueryui.com/
This software consists of voluntary contributions made by many
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
77 README.md
View
@@ -5,14 +5,16 @@ jQuery UI provides interactions like Drag and Drop and widgets like Autocomplete
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started. Or visit the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
-If you are interested in helping developing jQuery UI, you are in the right place.
-To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
+If you are interested in helping develop jQuery UI, you are in the right place.
+To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or in #jquery on irc.freednode.net.
+
For contributors
---
+
If you want to help and provide a patch for a bugfix or new feature, please take
-a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
-in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
+a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved).
+In particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).
In general, fork the project, create a branch for a specific change and send a
@@ -20,19 +22,78 @@ pull request for that branch. Don't mix unrelated changes. You can use the commi
message as the description for the pull request.
+Running the Unit Tests
+---
+
+Run the unit tests with a local server that supports PHP. No database is required. Pre-configured php local servers are available for Windows and Mac. Here are some options:
+
+- Windows: [WAMP download](http://www.wampserver.com/en/)
+- Mac: [MAMP download](http://www.mamp.info/en/index.html)
+- Linux: [Setting up LAMP](https://www.linux.com/learn/tutorials/288158-easy-lamp-server-installation)
+- [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
+
+
+Building jQuery UI
+---
+
+jQuery UI uses the [grunt](http://github.com/cowboy/grunt) build system. Building jQuery UI requires node.js and a command line zip program.
+
+Install grunt.
+
+`npm install grunt -g`
+
+Clone the jQuery UI git repo.
+
+`git clone git://github.com/jquery/jquery-ui.git`
+
+`cd jquery-ui`
+
+Install node modules.
+
+`npm install`
+
+Run grunt.
+
+`grunt build`
+
+There are many other tasks that can be run through grunt. For a list of all tasks:
+
+`grunt --help`
+
+
For committers
---
+
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
-Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
+Do not merge pull requests directly through GitHub's interface.
+Most pull requests are a single commit; cherry-picking will avoid creating a merge commit.
+It's also common for contributors to make minor fixes in an additional one or two commits.
+These should be squashed before landing in master.
- git remote add [username] [his-fork.git] -f
+**Make sure the author has a valid name and email address associated with the commit.**
-If you want just one commit and edit the commit message:
+Fetch the remote first:
+
+ git fetch [their-fork.git] [their-branch]
+
+Then cherry-pick the commit(s):
+
+ git cherry-pick [sha-of-commit]
+
+If you need to edit the commit message:
git cherry-pick -e [sha-of-commit]
+If you need to edit the changes:
+
+ git cherry-pick -n [sha-of-commit]
+ # make changes
+ git commit --author="[author-name-and-email]"
+
If it should go to the stable brach, cherry-pick it to stable:
git checkout 1-8-stable
- git cherry-pick -x [sha-of-commit]
+ git cherry-pick -x [sha-of-commit-from-master]
+
+*NOTE: Do not cherry-pick into 1-8-stable until you have pushed the commit from master upstream.*
373 build/build.xml
View
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!--
- jQuery UI Release!
-
- Call task called 'deploy-release' to build a full release.
- The release built will be stored on 'dist' dir.
-
--->
-
-<project name="jquery-ui" default="deploy-release" basedir=".">
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties">
- <classpath>
- <pathelement location="build/ant-contrib-0.6.jar"/>
- </classpath>
- </taskdef>
-
- <property file="ant.properties" />
-
- <loadfile failonerror="no" srcFile="../version.txt" property="release.version">
- <filterchain><striplinebreaks/></filterchain>
- </loadfile>
- <property name="release.filename" value="jquery-ui-${release.version}" />
-
- <property name="dist.dir" value="dist/${release.filename}/" />
- <property name="cdndist.dir" value="dist/${release.filename}-cdn" />
- <property name="build.dir" value="build" />
- <property name="ui.dir" value="../" />
- <property name="src.dir" value="${ui.dir}/ui/" />
- <property name="theme.dir" value="${ui.dir}/themes/base/" />
- <property name="docs.dir" value="${dist.dir}/docs/" />
- <property name="min.dir" value="${dist.dir}/ui/minified" />
- <property name="size.dir" value="size" />
-
- <property name="concatenated" value="jquery-ui" />
- <property name="concatenated.i18n" value="jquery-ui-i18n" />
-
- <property name="core.files" value="jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js" />
- <property name="core.files.min" value="jquery.ui.core.min.js, jquery.ui.widget.min.js, jquery.ui.mouse.min.js, jquery.ui.draggable.min.js, jquery.ui.droppable.min.js, jquery.ui.resizable.min.js, jquery.ui.selectable.min.js, jquery.ui.sortable.min.js, jquery.effects.core.min.js" />
-
- <property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
-
- <target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
- </target>
-
- <target name="replace-version">
- <replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
- <fileset dir="${dist.dir}/ui/" includes="*.js"/>
- <fileset dir="${dist.dir}/ui/minified/" includes="*.js"/>
- <fileset dir="${dist.dir}/themes/" includes="**/*.css"/>
- </replaceregexp>
- <echo message="Replaced all @VERSION to ${release.version}." />
- </target>
-
- <target name="prepend-header">
- <copy todir="${dist.dir}/headers/">
- <fileset dir="${dist.dir}/themes/base" includes="*.css" />
- </copy>
- <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
- <fileset dir="${dist.dir}/headers/" includes="*.css"/>
- </replaceregexp>
- <for param="file">
- <path><fileset dir="${dist.dir}/themes/base/minified" includes="*.css" /></path>
- <sequential>
- <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.css$" replace="\1"/>
- <concat destfile="${dist.dir}/ui-headered/${target}.min.css">
- <header file="${dist.dir}/headers/${target}.css" />
- <fileset file="@{file}" />
- </concat>
- </sequential>
- </for>
- <copy todir="${dist.dir}/themes/base/minified" overwrite="true">
- <fileset dir="${dist.dir}/ui-headered/" includes="*.css" />
- </copy>
-
- <delete dir="${dist.dir}/headers/" />
- <delete dir="${dist.dir}/ui-headered/" />
- </target>
-
- <target description="Zip the package" name="zip">
- <zip destfile="${dist.dir}/../${release.filename}.zip">
- <zipfileset dir="dist/" />
- </zip>
- </target>
-
- <target name="concatenate">
- <echo message="Building concatenated" />
- <mkdir dir="${dist.dir}/ui/" />
- <delete file="${dist.dir}/ui/${concatenated}.js" />
-
- <concat destfile="${dist.dir}/ui/${concatenated}.js">
- <filelist dir="${src.dir}/" files="${core.files}" />
- <fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" excludes="${core.files}" />
- </concat>
- <echo message="Concatenated built." />
-
- <concat destfile="${dist.dir}/themes/base/${concatenated}.css">
- <fileset dir="${theme.dir}/" includes="jquery.ui.core.css" />
- <fileset dir="${theme.dir}/" includes="jquery.ui.*.css" excludes="jquery.ui.all.css, jquery.ui.core.css, jquery.ui.base.css, jquery.ui.theme.css" />
- <fileset dir="${theme.dir}/" includes="jquery.ui.theme.css" />
- </concat>
- <echo message="Concatenated theme." />
-
- <mkdir dir="${dist.dir}/ui/i18n/" />
- <delete file="${dist.dir}/ui/i18n/${concatenated.i18n}.js" />
-
- <concat destfile="${dist.dir}/ui/i18n/${concatenated.i18n}.js" encoding="utf-8">
- <fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
- </concat>
- <echo message="Concatenated i18n built." />
- </target>
-
- <target name="minify" depends="concatenate" description="Remove all comments and whitespace, no compression, great in combination with GZip">
- <echo message="Building minified" />
- <mkdir dir="${min.dir}" />
- <mkdir dir="${min.dir}/i18n/" />
- <mkdir dir="${dist.dir}/themes/base/minified" />
- <parallel threadsperprocessor="1">
- <apply executable="build/minify-js.sh">
- <fileset dir="${dist.dir}/ui" includes="**.js" />
- <srcfile />
- <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
- <targetfile/>
- </apply>
- <apply executable="build/minify-js.sh">
- <fileset dir="${dist.dir}/ui/i18n" includes="**.js" />
- <srcfile />
- <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
- <targetfile/>
- </apply>
- <apply executable="java" parallel="false">
- <fileset dir="${dist.dir}/themes/base" includes="*.css" />
- <arg line="-jar" />
- <arg path="${yuicompressor-jar}" />
- <arg line="--charset utf-8" />
- <arg line="-v" />
- <srcfile />
- <arg line="-o" />
- <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
- <targetfile/>
- </apply>
- </parallel>
-
- <replaceregexp match=".css" replace=".min.css" flags="g">
- <fileset dir="${dist.dir}/themes/base/minified/">
- <include name="*.base.min.css"/>
- <include name="*.all.min.css"/>
- </fileset>
- </replaceregexp>
-
- <!-- make a copy of all theme images to ensure that relative paths in minified css files work -->
- <copy todir="${dist.dir}/themes/base/minified/images" >
- <fileset dir="${ui.dir}/themes/base/images" />
- </copy>
-
- <!-- make a copy of the minified files for use in tests -->
- <copy todir="dist" file="${min.dir}/jquery-ui.min.js" />
- <copy todir="dist/theme" file="${dist.dir}/themes/base/minified/jquery-ui.min.css" />
- <copy todir="dist/theme/images" >
- <fileset dir="${ui.dir}/themes/base/images" />
- </copy>
-
- <echo message="Minified ui/ built." />
- </target>
-
- <target description="Copy needed folders" name="copy">
- <echo message="Copying files" />
- <mkdir dir="${dist.dir}" />
-
- <copy overwrite="true" todir="${dist.dir}/">
- <fileset dir="${ui.dir}/" includes="jquery-*.js" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/ui/">
- <fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/ui/i18n/" >
- <fileset dir="${src.dir}/i18n/" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/">
- <fileset dir="${ui.dir}/" includes="*.txt" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/demos/" >
- <fileset dir="${ui.dir}/demos/" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/external/" >
- <fileset dir="${ui.dir}/external/" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/tests/" >
- <fileset dir="${ui.dir}/tests/" />
- </copy>
-
- <copy overwrite="true" todir="${dist.dir}/themes/" >
- <fileset dir="${ui.dir}/themes/" />
- </copy>
- <echo message="Files copied." />
- </target>
-
- <target name="clean">
- <delete dir="dist" />
- </target>
-
- <target name="docs-download">
- <mkdir dir="${docs.dir}" />
- <property name="url" value="http://docs.jquery.com/action/render/UI/API/${release.version}/" />
- <parallel threadcount="8">
- <get src="${url}Draggable" dest="${docs.dir}draggable.html" />
- <get src="${url}Droppable" dest="${docs.dir}droppable.html" />
- <get src="${url}Resizable" dest="${docs.dir}resizable.html" />
- <get src="${url}Selectable" dest="${docs.dir}selectable.html" />
- <get src="${url}Sortable" dest="${docs.dir}sortable.html" />
-
- <get src="${url}Accordion" dest="${docs.dir}accordion.html" />
- <get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
- <get src="${url}Button" dest="${docs.dir}button.html" />
- <get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
- <get src="${url}Dialog" dest="${docs.dir}dialog.html" />
- <get src="${url}Menu" dest="${docs.dir}menu.html" />
- <get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
- <get src="${url}Slider" dest="${docs.dir}slider.html" />
- <get src="${url}Spinner" dest="${docs.dir}spinner.html" />
- <get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
- <get src="${url}Tabs" dest="${docs.dir}tabs.html" />
-
- <get src="${url}Position" dest="${docs.dir}position.html" />
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
-
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
- </parallel>
- </target>
-
- <target name="themes-download">
- <!-- to create/update query strings for the theme-file, execute this in Firebug on /download page:
- $("select option[value!=none]").map(function() { $(this).parent().val(this.value).change(); return $(this).parents("form").serialize(); }).get().join(",");
- -->
- <loadfile srcFile="themes" property="urls" />
- <property name="zip" value="${dist.dir}themes/tmp.zip" />
- <mkdir dir="${dist.dir}themes" />
- <for list="${urls}" param="url">
- <sequential>
- <get src="http://ui-dev.jquery.com/download/?@{url}" dest="${zip}" />
- <unzip src="${zip}" dest="${dist.dir}themes/">
- <patternset>
- <include name="development-bundle/themes/**"/>
- <exclude name="development-bundle/themes/base/**"/>
- </patternset>
- <mapper type="glob" from="development-bundle/themes/*" to="*" />
- </unzip>
- <delete file="${zip}" />
- </sequential>
- </for>
- <move todir="${dist.dir}themes/">
- <fileset dir="${dist.dir}themes/" />
- <mapper>
- <mapper type="regexp" from="(.*)jquery-ui-.*custom.css" to="\1jquery-ui.css" />
- </mapper>
- </move>
- <copy todir="dist/jquery-ui-themes-${release.version}">
- <fileset dir="${dist.dir}/" includes="AUTHORS.txt,GPL-LICENSE.txt,MIT-LICENSE.txt,version.txt,themes/**" />
- </copy>
- <zip destfile="${dist.dir}/../jquery-ui-themes-${release.version}.zip">
- <zipfileset dir="dist/" includes="jquery-ui-themes-${release.version}/" />
- </zip>
- </target>
-
- <target name="whitespace">
- <replaceregexp match="[\t ]+$" replace="" flags="g" byline="true">
- <fileset dir="${src.dir}" includes="*.js"/>
- <fileset dir="${src.dir}/i18n/" includes="*.js"/>
- </replaceregexp>
- <echo message="All trailing spaces removed." />
- </target>
-
- <target name="size" depends="copy, minify, replace-version, prepend-header" description="Report sizes of files">
- <echo message="Collecting files to size" />
- <mkdir dir="${size.dir}" />
- <copy todir="${size.dir}">
- <fileset dir="${dist.dir}/ui" includes="*.js" />
- <fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
- <fileset dir="${dist.dir}/ui/minified" includes="*.js" />
- <fileset dir="${dist.dir}/ui/minified/i18n" includes="*.js" />
- <fileset dir="${dist.dir}/themes/base" includes="*.css" />
- <fileset dir="${dist.dir}/themes/base/minified" includes="*.css" />
- </copy>
- <echo message="GZipping Minified" />
- <apply executable="gzip">
- <fileset dir="${size.dir}" includes="*.min.js" />
- <fileset dir="${size.dir}" includes="*.min.css" />
- <arg value="-c" />
- <srcfile />
- <redirector>
- <outputmapper id="out" type="glob" from="*" to="${size.dir}/*.gz"/>
- </redirector>
- </apply>
- <echo message="Comparing file size with previous build" />
- <exec executable="bash">
- <arg value="-c" />
- <arg value="wc -c ${size.dir}/* | `which node nodejs 2>/dev/null` build/sizer.js" />
- </exec>
- <delete dir="${size.dir}" />
- </target>
-
- <target name="cdn">
- <delete dir="${cdndist.dir}" />
- <mkdir dir="${cdndist.dir}" />
- <copy todir="${cdndist.dir}">
- <fileset dir=".." includes="AUTHORS.txt, GPL-LICENSE.txt, MIT-LICENSE.txt, version.txt" />
- </copy>
- <copy todir="${cdndist.dir}">
- <fileset dir="${dist.dir}ui" includes="jquery-ui.js" />
- <fileset dir="${dist.dir}ui/minified" includes="jquery-ui.min.js" />
- </copy>
- <copy todir="${cdndist.dir}/i18n">
- <fileset dir="${dist.dir}ui/i18n" />
- <fileset dir="${dist.dir}ui/minified/i18n" />
- </copy>
- <copy todir="${cdndist.dir}/themes">
- <fileset dir="${dist.dir}themes" />
- </copy>
- <checksum>
- <fileset dir="${cdndist.dir}" />
- </checksum>
- <for param="file">
- <path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
- <sequential>
- <!-- @{file} is an absolute path, use that ugly regexes to make it relative -->
- <propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?cdn[\\/](.+)$" replace="\1"/>
- <propertyregex override="yes" property="relativepath" input="${relativepath}" regexp="\\" replace="/" global="true" />
- <concat destfile="${cdndist.dir}/MANIFEST" append="yes">${relativepath} </concat>
- <concat destfile="${cdndist.dir}/MANIFEST" append="yes"><file file="@{file}.MD5" /></concat>
- </sequential>
- </for>
- <delete dir="${cdndist.dir}" includes="**/*.MD5" />
- <zip destfile="${dist.dir}/../${release.filename}-googlecdn.zip">
- <zipfileset dir="dist/" includes="${release.filename}-cdn/" />
- </zip>
- <zip destfile="${dist.dir}/../${release.filename}-mscdn.zip">
- <zipfileset dir="dist/${release.filename}-cdn/" />
- </zip>
- </target>
-
-</project>
BIN  build/build/ant-contrib-0.6.jar
View
Binary file not shown
5,504 build/build/lib/jslint.js
View
0 additions, 5,504 deletions not shown
1,315 build/build/lib/parse-js.js
View
@@ -1,1315 +0,0 @@
-/***********************************************************************
-
- A JavaScript tokenizer / parser / beautifier / compressor.
-
- This version is suitable for Node.js. With minimal changes (the
- exports stuff) it should work on any JS platform.
-
- This file contains the tokenizer/parser. It is a port to JavaScript
- of parse-js [1], a JavaScript parser library written in Common Lisp
- by Marijn Haverbeke. Thank you Marijn!
-
- [1] http://marijn.haverbeke.nl/parse-js/
-
- Exported functions:
-
- - tokenizer(code) -- returns a function. Call the returned
- function to fetch the next token.
-
- - parse(code) -- returns an AST of the given JavaScript code.
-
- -------------------------------- (C) ---------------------------------
-
- Author: Mihai Bazon
- <mihai.bazon@gmail.com>
- http://mihai.bazon.net/blog
-
- Distributed under the BSD license:
-
- Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
- Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- * Redistributions of source code must retain the above
- copyright notice, this list of conditions and the following
- disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials
- provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- ***********************************************************************/
-
-/* -----[ Tokenizer (constants) ]----- */
-
-var KEYWORDS = array_to_hash([
- "break",
- "case",
- "catch",
- "const",
- "continue",
- "default",
- "delete",
- "do",
- "else",
- "finally",
- "for",
- "function",
- "if",
- "in",
- "instanceof",
- "new",
- "return",
- "switch",
- "throw",
- "try",
- "typeof",
- "var",
- "void",
- "while",
- "with"
-]);
-
-var RESERVED_WORDS = array_to_hash([
- "abstract",
- "boolean",
- "byte",
- "char",
- "class",
- "debugger",
- "double",
- "enum",
- "export",
- "extends",
- "final",
- "float",
- "goto",
- "implements",
- "import",
- "int",
- "interface",
- "long",
- "native",
- "package",
- "private",
- "protected",
- "public",
- "short",
- "static",
- "super",
- "synchronized",
- "throws",
- "transient",
- "volatile"
-]);
-
-var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([
- "return",
- "new",
- "delete",
- "throw",
- "else",
- "case"
-]);
-
-var KEYWORDS_ATOM = array_to_hash([
- "false",
- "null",
- "true",
- "undefined"
-]);
-
-var OPERATOR_CHARS = array_to_hash(characters("+-*&%=<>!?|~^"));
-
-var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
-var RE_OCT_NUMBER = /^0[0-7]+$/;
-var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i;
-
-var OPERATORS = array_to_hash([
- "in",
- "instanceof",
- "typeof",
- "new",
- "void",
- "delete",
- "++",
- "--",
- "+",
- "-",
- "!",
- "~",
- "&",
- "|",
- "^",
- "*",
- "/",
- "%",
- ">>",
- "<<",
- ">>>",
- "<",
- ">",
- "<=",
- ">=",
- "==",
- "===",
- "!=",
- "!==",
- "?",
- "=",
- "+=",
- "-=",
- "/=",
- "*=",
- "%=",
- ">>=",
- "<<=",
- ">>>=",
- "|=",
- "^=",
- "&=",
- "&&",
- "||"
-]);
-
-var WHITESPACE_CHARS = array_to_hash(characters(" \n\r\t\u200b"));
-
-var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{}(,.;:"));
-
-var PUNC_CHARS = array_to_hash(characters("[]{}(),;:"));
-
-var REGEXP_MODIFIERS = array_to_hash(characters("gmsiy"));
-
-/* -----[ Tokenizer ]----- */
-
-// regexps adapted from http://xregexp.com/plugins/#unicode
-var UNICODE = {
- letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0523\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0621-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971\\u0972\\u097B-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D28\\u0D2A-\\u0D39\\u0D3D\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC\\u0EDD\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8B\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10D0-\\u10FA\\u10FC\\u1100-\\u1159\\u115F-\\u11A2\\u11A8-\\u11F9\\u1200-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u1676\\u1681-\\u169A\\u16A0-\\u16EA\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19A9\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u2094\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2C6F\\u2C71-\\u2C7D\\u2C80-\\u2CE4\\u2D00-\\u2D25\\u2D30-\\u2D65\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31B7\\u31F0-\\u31FF\\u3400\\u4DB5\\u4E00\\u9FC3\\uA000-\\uA48C\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA65F\\uA662-\\uA66E\\uA67F-\\uA697\\uA717-\\uA71F\\uA722-\\uA788\\uA78B\\uA78C\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA90A-\\uA925\\uA930-\\uA946\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAC00\\uD7A3\\uF900-\\uFA2D\\uFA30-\\uFA6A\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"),
- non_spacing_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065E\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0900-\\u0902\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0955\\u0962\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2\\u09E3\\u0A01\\u0A02\\u0A3C\\u0A41\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7\\u0AC8\\u0ACD\\u0AE2\\u0AE3\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0CBC\\u0CBF\\u0CC6\\u0CCC\\u0CCD\\u0CE2\\u0CE3\\u0D41-\\u0D44\\u0D4D\\u0D62\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86\\u0F87\\u0F90-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039\\u103A\\u103D\\u103E\\u1058\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085\\u1086\\u108D\\u109D\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u1922\\u1927\\u1928\\u1932\\u1939-\\u193B\\u1A17\\u1A18\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80\\u1B81\\u1BA2-\\u1BA5\\u1BA8\\u1BA9\\u1C2C-\\u1C33\\u1C36\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1DC0-\\u1DE6\\u1DFD-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA67C\\uA67D\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA825\\uA826\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uAA29-\\uAA2E\\uAA31\\uAA32\\uAA35\\uAA36\\uAA43\\uAA4C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"),
- space_combining_mark: new RegExp("[\\u0903\\u093E-\\u0940\\u0949-\\u094C\\u094E\\u0982\\u0983\\u09BE-\\u09C0\\u09C7\\u09C8\\u09CB\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB\\u0ACC\\u0B02\\u0B03\\u0B3E\\u0B40\\u0B47\\u0B48\\u0B4B\\u0B4C\\u0B57\\u0BBE\\u0BBF\\u0BC1\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7\\u0CC8\\u0CCA\\u0CCB\\u0CD5\\u0CD6\\u0D02\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0F3E\\u0F3F\\u0F7F\\u102B\\u102C\\u1031\\u1038\\u103B\\u103C\\u1056\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930\\u1931\\u1933-\\u1938\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A19-\\u1A1B\\u1A55\\u1A57\\u1A61\\u1A63\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43\\u1B44\\u1B82\\u1BA1\\u1BA6\\u1BA7\\u1BAA\\u1C24-\\u1C2B\\u1C34\\u1C35\\u1CE1\\u1CF2\\uA823\\uA824\\uA827\\uA880\\uA881\\uA8B4-\\uA8C3\\uA952\\uA953\\uA983\\uA9B4\\uA9B5\\uA9BA\\uA9BB\\uA9BD-\\uA9C0\\uAA2F\\uAA30\\uAA33\\uAA34\\uAA4D\\uAA7B\\uABE3\\uABE4\\uABE6\\uABE7\\uABE9\\uABEA\\uABEC]"),
- connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]")
-};
-
-function is_letter(ch) {
- return UNICODE.letter.test(ch);
-};
-
-function is_digit(ch) {
- ch = ch.charCodeAt(0);
- return ch >= 48 && ch <= 57; //XXX: find out if "UnicodeDigit" means something else than 0..9
-};
-
-function is_alphanumeric_char(ch) {
- return is_digit(ch) || is_letter(ch);
-};
-
-function is_unicode_combining_mark(ch) {
- return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch);
-};
-
-function is_unicode_connector_punctuation(ch) {
- return UNICODE.connector_punctuation.test(ch);
-};
-
-function is_identifier_start(ch) {
- return ch == "$" || ch == "_" || is_letter(ch);
-};
-
-function is_identifier_char(ch) {
- return is_identifier_start(ch)
- || is_unicode_combining_mark(ch)
- || is_digit(ch)
- || is_unicode_connector_punctuation(ch)
- || ch == "\u200c" // zero-width non-joiner <ZWNJ>
- || ch == "\u200d" // zero-width joiner <ZWJ> (in my ECMA-262 PDF, this is also 200c)
- ;
-};
-
-function parse_js_number(num) {
- if (RE_HEX_NUMBER.test(num)) {
- return parseInt(num.substr(2), 16);
- } else if (RE_OCT_NUMBER.test(num)) {
- return parseInt(num.substr(1), 8);
- } else if (RE_DEC_NUMBER.test(num)) {
- return parseFloat(num);
- }
-};
-
-function JS_Parse_Error(message, line, col, pos) {
- this.message = message;
- this.line = line;
- this.col = col;
- this.pos = pos;
- try {
- ({})();
- } catch(ex) {
- this.stack = ex.stack;
- };
-};
-
-JS_Parse_Error.prototype.toString = function() {
- return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack;
-};
-
-function js_error(message, line, col, pos) {
- throw new JS_Parse_Error(message, line, col, pos);
-};
-
-function is_token(token, type, val) {
- return token.type == type && (val == null || token.value == val);
-};
-
-var EX_EOF = {};
-
-function tokenizer($TEXT) {
-
- var S = {
- text : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, ''),
- pos : 0,
- tokpos : 0,
- line : 0,
- tokline : 0,
- col : 0,
- tokcol : 0,
- newline_before : false,
- regex_allowed : false,
- comments_before : []
- };
-
- function peek() { return S.text.charAt(S.pos); };
-
- function next(signal_eof) {
- var ch = S.text.charAt(S.pos++);
- if (signal_eof && !ch)
- throw EX_EOF;
- if (ch == "\n") {
- S.newline_before = true;
- ++S.line;
- S.col = 0;
- } else {
- ++S.col;
- }
- return ch;
- };
-
- function eof() {
- return !S.peek();
- };
-
- function find(what, signal_eof) {
- var pos = S.text.indexOf(what, S.pos);
- if (signal_eof && pos == -1) throw EX_EOF;
- return pos;
- };
-
- function start_token() {
- S.tokline = S.line;
- S.tokcol = S.col;
- S.tokpos = S.pos;
- };
-
- function token(type, value, is_comment) {
- S.regex_allowed = ((type == "operator" && !HOP(UNARY_POSTFIX, value)) ||
- (type == "keyword" && HOP(KEYWORDS_BEFORE_EXPRESSION, value)) ||
- (type == "punc" && HOP(PUNC_BEFORE_EXPRESSION, value)));
- var ret = {
- type : type,
- value : value,
- line : S.tokline,
- col : S.tokcol,
- pos : S.tokpos,
- nlb : S.newline_before
- };
- if (!is_comment) {
- ret.comments_before = S.comments_before;
- S.comments_before = [];
- }
- S.newline_before = false;
- return ret;
- };
-
- function skip_whitespace() {
- while (HOP(WHITESPACE_CHARS, peek()))
- next();
- };
-
- function read_while(pred) {
- var ret = "", ch = peek(), i = 0;
- while (ch && pred(ch, i++)) {
- ret += next();
- ch = peek();
- }
- return ret;
- };
-
- function parse_error(err) {
- js_error(err, S.tokline, S.tokcol, S.tokpos);
- };
-
- function read_num(prefix) {
- var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
- var num = read_while(function(ch, i){
- if (ch == "x" || ch == "X") {
- if (has_x) return false;
- return has_x = true;
- }
- if (!has_x && (ch == "E" || ch == "e")) {
- if (has_e) return false;
- return has_e = after_e = true;
- }
- if (ch == "-") {
- if (after_e || (i == 0 && !prefix)) return true;
- return false;
- }
- if (ch == "+") return after_e;
- after_e = false;
- if (ch == ".") {
- if (!has_dot && !has_x)
- return has_dot = true;
- return false;
- }
- return is_alphanumeric_char(ch);
- });
- if (prefix)
- num = prefix + num;
- var valid = parse_js_number(num);
- if (!isNaN(valid)) {
- return token("num", valid);
- } else {
- parse_error("Invalid syntax: " + num);
- }
- };
-
- function read_escaped_char() {
- var ch = next(true);
- switch (ch) {
- case "n" : return "\n";
- case "r" : return "\r";
- case "t" : return "\t";
- case "b" : return "\b";
- case "v" : return "\v";
- case "f" : return "\f";
- case "0" : return "\0";
- case "x" : return String.fromCharCode(hex_bytes(2));
- case "u" : return String.fromCharCode(hex_bytes(4));
- default : return ch;
- }
- };
-
- function hex_bytes(n) {
- var num = 0;
- for (; n > 0; --n) {
- var digit = parseInt(next(true), 16);
- if (isNaN(digit))
- parse_error("Invalid hex-character pattern in string");
- num = (num << 4) | digit;
- }
- return num;
- };
-
- function read_string() {
- return with_eof_error("Unterminated string constant", function(){
- var quote = next(), ret = "";
- for (;;) {
- var ch = next(true);
- if (ch == "\\") ch = read_escaped_char();
- else if (ch == quote) break;
- ret += ch;
- }
- return token("string", ret);
- });
- };
-
- function read_line_comment() {
- next();
- var i = find("\n"), ret;
- if (i == -1) {
- ret = S.text.substr(S.pos);
- S.pos = S.text.length;
- } else {
- ret = S.text.substring(S.pos, i);
- S.pos = i;
- }
- return token("comment1", ret, true);
- };
-
- function read_multiline_comment() {
- next();
- return with_eof_error("Unterminated multiline comment", function(){
- var i = find("*/", true),
- text = S.text.substring(S.pos, i),
- tok = token("comment2", text, true);
- S.pos = i + 2;
- S.line += text.split("\n").length - 1;
- S.newline_before = text.indexOf("\n") >= 0;
-
- // https://github.com/mishoo/UglifyJS/issues/#issue/100
- if (/^@cc_on/i.test(text)) {
- warn("WARNING: at line " + S.line);
- warn("*** Found \"conditional comment\": " + text);
- warn("*** UglifyJS DISCARDS ALL COMMENTS. This means your code might no longer work properly in Internet Explorer.");
- }
-
- return tok;
- });
- };
-
- function read_name() {
- var backslash = false, name = "", ch;
- while ((ch = peek()) != null) {
- if (!backslash) {
- if (ch == "\\") backslash = true, next();
- else if (is_identifier_char(ch)) name += next();
- else break;
- }
- else {
- if (ch != "u") parse_error("Expecting UnicodeEscapeSequence -- uXXXX");
- ch = read_escaped_char();
- if (!is_identifier_char(ch)) parse_error("Unicode char: " + ch.charCodeAt(0) + " is not valid in identifier");
- name += ch;
- backslash = false;
- }
- }
- return name;
- };
-
- function read_regexp() {
- return with_eof_error("Unterminated regular expression", function(){
- var prev_backslash = false, regexp = "", ch, in_class = false;
- while ((ch = next(true))) if (prev_backslash) {
- regexp += "\\" + ch;
- prev_backslash = false;
- } else if (ch == "[") {
- in_class = true;
- regexp += ch;
- } else if (ch == "]" && in_class) {
- in_class = false;
- regexp += ch;
- } else if (ch == "/" && !in_class) {
- break;
- } else if (ch == "\\") {
- prev_backslash = true;
- } else {
- regexp += ch;
- }
- var mods = read_name();
- return token("regexp", [ regexp, mods ]);
- });
- };
-
- function read_operator(prefix) {
- function grow(op) {
- if (!peek()) return op;
- var bigger = op + peek();
- if (HOP(OPERATORS, bigger)) {
- next();
- return grow(bigger);
- } else {
- return op;
- }
- };
- return token("operator", grow(prefix || next()));
- };
-
- function handle_slash() {
- next();
- var regex_allowed = S.regex_allowed;
- switch (peek()) {
- case "/":
- S.comments_before.push(read_line_comment());
- S.regex_allowed = regex_allowed;
- return next_token();
- case "*":
- S.comments_before.push(read_multiline_comment());
- S.regex_allowed = regex_allowed;
- return next_token();
- }
- return S.regex_allowed ? read_regexp() : read_operator("/");
- };
-
- function handle_dot() {
- next();
- return is_digit(peek())
- ? read_num(".")
- : token("punc", ".");
- };
-
- function read_word() {
- var word = read_name();
- return !HOP(KEYWORDS, word)
- ? token("name", word)
- : HOP(OPERATORS, word)
- ? token("operator", word)
- : HOP(KEYWORDS_ATOM, word)
- ? token("atom", word)
- : token("keyword", word);
- };
-
- function with_eof_error(eof_error, cont) {
- try {
- return cont();
- } catch(ex) {
- if (ex === EX_EOF) parse_error(eof_error);
- else throw ex;
- }
- };
-
- function next_token(force_regexp) {
- if (force_regexp)
- return read_regexp();
- skip_whitespace();
- start_token();
- var ch = peek();
- if (!ch) return token("eof");
- if (is_digit(ch)) return read_num();
- if (ch == '"' || ch == "'") return read_string();
- if (HOP(PUNC_CHARS, ch)) return token("punc", next());
- if (ch == ".") return handle_dot();
- if (ch == "/") return handle_slash();
- if (HOP(OPERATOR_CHARS, ch)) return read_operator();
- if (ch == "\\" || is_identifier_start(ch)) return read_word();
- parse_error("Unexpected character '" + ch + "'");
- };
-
- next_token.context = function(nc) {
- if (nc) S = nc;
- return S;
- };
-
- return next_token;
-
-};
-
-/* -----[ Parser (constants) ]----- */
-
-var UNARY_PREFIX = array_to_hash([
- "typeof",
- "void",
- "delete",
- "--",
- "++",
- "!",
- "~",
- "-",
- "+"
-]);
-
-var UNARY_POSTFIX = array_to_hash([ "--", "++" ]);
-
-var ASSIGNMENT = (function(a, ret, i){
- while (i < a.length) {
- ret[a[i]] = a[i].substr(0, a[i].length - 1);
- i++;
- }
- return ret;
-})(
- ["+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&="],
- { "=": true },
- 0
-);
-
-var PRECEDENCE = (function(a, ret){
- for (var i = 0, n = 1; i < a.length; ++i, ++n) {
- var b = a[i];
- for (var j = 0; j < b.length; ++j) {
- ret[b[j]] = n;
- }
- }
- return ret;
-})(
- [
- ["||"],
- ["&&"],
- ["|"],
- ["^"],
- ["&"],
- ["==", "===", "!=", "!=="],
- ["<", ">", "<=", ">=", "in", "instanceof"],
- [">>", "<<", ">>>"],
- ["+", "-"],
- ["*", "/", "%"]
- ],
- {}
-);
-
-var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]);
-
-var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]);
-
-/* -----[ Parser ]----- */
-
-function NodeWithToken(str, start, end) {
- this.name = str;
- this.start = start;
- this.end = end;
-};
-
-NodeWithToken.prototype.toString = function() { return this.name; };
-
-function parse($TEXT, exigent_mode, embed_tokens) {
-
- var S = {
- input : typeof $TEXT == "string" ? tokenizer($TEXT, true) : $TEXT,
- token : null,
- prev : null,
- peeked : null,
- in_function : 0,
- in_loop : 0,
- labels : []
- };
-
- S.token = next();
-
- function is(type, value) {
- return is_token(S.token, type, value);
- };
-
- function peek() { return S.peeked || (S.peeked = S.input()); };
-
- function next() {
- S.prev = S.token;
- if (S.peeked) {
- S.token = S.peeked;
- S.peeked = null;
- } else {
- S.token = S.input();
- }
- return S.token;
- };
-
- function prev() {
- return S.prev;
- };
-
- function croak(msg, line, col, pos) {
- var ctx = S.input.context();
- js_error(msg,
- line != null ? line : ctx.tokline,
- col != null ? col : ctx.tokcol,
- pos != null ? pos : ctx.tokpos);
- };
-
- function token_error(token, msg) {
- croak(msg, token.line, token.col);
- };
-
- function unexpected(token) {
- if (token == null)
- token = S.token;
- token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
- };
-
- function expect_token(type, val) {
- if (is(type, val)) {
- return next();
- }
- token_error(S.token, "Unexpected token " + S.token.type + ", expected " + type);
- };
-
- function expect(punc) { return expect_token("punc", punc); };
-
- function can_insert_semicolon() {
- return !exigent_mode && (
- S.token.nlb || is("eof") || is("punc", "}")
- );
- };
-
- function semicolon() {
- if (is("punc", ";")) next();
- else if (!can_insert_semicolon()) unexpected();
- };
-
- function as() {
- return slice(arguments);
- };
-
- function parenthesised() {
- expect("(");
- var ex = expression();
- expect(")");
- return ex;
- };
-
- function add_tokens(str, start, end) {
- return str instanceof NodeWithToken ? str : new NodeWithToken(str, start, end);
- };
-
- function maybe_embed_tokens(parser) {
- if (embed_tokens) return function() {
- var start = S.token;
- var ast = parser.apply(this, arguments);
- ast[0] = add_tokens(ast[0], start, prev());
- return ast;
- };
- else return parser;
- };
-
- var statement = maybe_embed_tokens(function() {
- if (is("operator", "/")) {
- S.peeked = null;
- S.token = S.input(true); // force regexp
- }
- switch (S.token.type) {
- case "num":
- case "string":
- case "regexp":
- case "operator":
- case "atom":
- return simple_statement();
-
- case "name":
- return is_token(peek(), "punc", ":")
- ? labeled_statement(prog1(S.token.value, next, next))
- : simple_statement();
-
- case "punc":
- switch (S.token.value) {
- case "{":
- return as("block", block_());
- case "[":
- case "(":
- return simple_statement();
- case ";":
- next();
- return as("block");
- default:
- unexpected();
- }
-
- case "keyword":
- switch (prog1(S.token.value, next)) {
- case "break":
- return break_cont("break");
-
- case "continue":
- return break_cont("continue");
-
- case "debugger":
- semicolon();
- return as("debugger");
-
- case "do":
- return (function(body){
- expect_token("keyword", "while");
- return as("do", prog1(parenthesised, semicolon), body);
- })(in_loop(statement));
-
- case "for":
- return for_();
-
- case "function":
- return function_(true);
-
- case "if":
- return if_();
-
- case "return":
- if (S.in_function == 0)
- croak("'return' outside of function");
- return as("return",
- is("punc", ";")
- ? (next(), null)
- : can_insert_semicolon()
- ? null
- : prog1(expression, semicolon));
-
- case "switch":
- return as("switch", parenthesised(), switch_block_());
-
- case "throw":
- return as("throw", prog1(expression, semicolon));
-
- case "try":
- return try_();
-
- case "var":
- return prog1(var_, semicolon);
-
- case "const":
- return prog1(const_, semicolon);
-
- case "while":
- return as("while", parenthesised(), in_loop(statement));
-
- case "with":
- return as("with", parenthesised(), statement());
-
- default:
- unexpected();
- }
- }
- });
-
- function labeled_statement(label) {
- S.labels.push(label);
- var start = S.token, stat = statement();
- if (exigent_mode && !HOP(STATEMENTS_WITH_LABELS, stat[0]))
- unexpected(start);
- S.labels.pop();
- return as("label", label, stat);
- };
-
- function simple_statement() {
- return as("stat", prog1(expression, semicolon));
- };
-
- function break_cont(type) {
- var name = is("name") ? S.token.value : null;
- if (name != null) {
- next();
- if (!member(name, S.labels))
- croak("Label " + name + " without matching loop or statement");
- }
- else if (S.in_loop == 0)
- croak(type + " not inside a loop or switch");
- semicolon();
- return as(type, name);
- };
-
- function for_() {
- expect("(");
- var init = null;
- if (!is("punc", ";")) {
- init = is("keyword", "var")
- ? (next(), var_(true))
- : expression(true, true);
- if (is("operator", "in"))
- return for_in(init);
- }
- return regular_for(init);
- };
-
- function regular_for(init) {
- expect(";");
- var test = is("punc", ";") ? null : expression();
- expect(";");
- var step = is("punc", ")") ? null : expression();
- expect(")");
- return as("for", init, test, step, in_loop(statement));
- };
-
- function for_in(init) {
- var lhs = init[0] == "var" ? as("name", init[1][0]) : init;
- next();
- var obj = expression();
- expect(")");
- return as("for-in", init, lhs, obj, in_loop(statement));
- };
-
- var function_ = maybe_embed_tokens(function(in_statement) {
- var name = is("name") ? prog1(S.token.value, next) : null;
- if (in_statement && !name)
- unexpected();
- expect("(");
- return as(in_statement ? "defun" : "function",
- name,
- // arguments
- (function(first, a){
- while (!is("punc", ")")) {
- if (first) first = false; else expect(",");
- if (!is("name")) unexpected();
- a.push(S.token.value);
- next();
- }
- next();
- return a;
- })(true, []),
- // body
- (function(){
- ++S.in_function;
- var loop = S.in_loop;
- S.in_loop = 0;
- var a = block_();
- --S.in_function;
- S.in_loop = loop;
- return a;
- })());
- });
-
- function if_() {
- var cond = parenthesised(), body = statement(), belse;
- if (is("keyword", "else")) {
- next();
- belse = statement();
- }
- return as("if", cond, body, belse);
- };
-
- function block_() {
- expect("{");
- var a = [];
- while (!is("punc", "}")) {
- if (is("eof")) unexpected();
- a.push(statement());
- }
- next();
- return a;
- };
-
- var switch_block_ = curry(in_loop, function(){
- expect("{");
- var a = [], cur = null;
- while (!is("punc", "}")) {
- if (is("eof")) unexpected();
- if (is("keyword", "case")) {
- next();
- cur = [];
- a.push([ expression(), cur ]);
- expect(":");
- }
- else if (is("keyword", "default")) {
- next();
- expect(":");
- cur = [];
- a.push([ null, cur ]);
- }
- else {
- if (!cur) unexpected();
- cur.push(statement());
- }
- }
- next();
- return a;
- });
-
- function try_() {
- var body = block_(), bcatch, bfinally;
- if (is("keyword", "catch")) {
- next();
- expect("(");
- if (!is("name"))
- croak("Name expected");
- var name = S.token.value;
- next();
- expect(")");
- bcatch = [ name, block_() ];
- }
- if (is("keyword", "finally")) {
- next();
- bfinally = block_();
- }
- if (!bcatch && !bfinally)
- croak("Missing catch/finally blocks");
- return as("try", body, bcatch, bfinally);
- };
-
- function vardefs(no_in) {
- var a = [];
- for (;;) {
- if (!is("name"))
- unexpected();
- var name = S.token.value;
- next();
- if (is("operator", "=")) {
- next();
- a.push([ name, expression(false, no_in) ]);
- } else {
- a.push([ name ]);
- }
- if (!is("punc", ","))
- break;
- next();
- }
- return a;
- };
-
- function var_(no_in) {
- return as("var", vardefs(no_in));
- };
-
- function const_() {
- return as("const", vardefs());
- };
-
- function new_() {
- var newexp = expr_atom(false), args;
- if (is("punc", "(")) {
- next();
- args = expr_list(")");
- } else {
- args = [];
- }
- return subscripts(as("new", newexp, args), true);
- };
-
- var expr_atom = maybe_embed_tokens(function(allow_calls) {
- if (is("operator", "new")) {
- next();
- return new_();
- }
- if (is("operator") && HOP(UNARY_PREFIX, S.token.value)) {
- return make_unary("unary-prefix",
- prog1(S.token.value, next),
- expr_atom(allow_calls));
- }
- if (is("punc")) {
- switch (S.token.value) {
- case "(":
- next();
- return subscripts(prog1(expression, curry(expect, ")")), allow_calls);
- case "[":
- next();
- return subscripts(array_(), allow_calls);
- case "{":
- next();
- return subscripts(object_(), allow_calls);
- }
- unexpected();
- }
- if (is("keyword", "function")) {
- next();
- return subscripts(function_(false), allow_calls);
- }
- if (HOP(ATOMIC_START_TOKEN, S.token.type)) {
- var atom = S.token.type == "regexp"
- ? as("regexp", S.token.value[0], S.token.value[1])
- : as(S.token.type, S.token.value);
- return subscripts(prog1(atom, next), allow_calls);
- }
- unexpected();
- });
-
- function expr_list(closing, allow_trailing_comma, allow_empty) {
- var first = true, a = [];
- while (!is("punc", closing)) {
- if (first) first = false; else expect(",");
- if (allow_trailing_comma && is("punc", closing)) break;
- if (is("punc", ",") && allow_empty) {
- a.push([ "atom", "undefined" ]);
- } else {
- a.push(expression(false));
- }
- }
- next();
- return a;
- };
-
- function array_() {
- return as("array", expr_list("]", !exigent_mode, true));
- };
-
- function object_() {
- var first = true, a = [];
- while (!is("punc", "}")) {
- if (first) first = false; else expect(",");
- if (!exigent_mode && is("punc", "}"))
- // allow trailing comma
- break;
- var type = S.token.type;
- var name = as_property_name();
- if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) {
- a.push([ as_name(), function_(false), name ]);
- } else {
- expect(":");
- a.push([ name, expression(false) ]);
- }
- }
- next();
- return