sproutcore 1.6.0.rc.1-x86-mingw32 → 1.6.0.rc.2-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (217) hide show
  1. data/CHANGELOG +31 -6
  2. data/{History.txt → History.rdoc} +0 -0
  3. data/{README.txt → README.rdoc} +3 -2
  4. data/Rakefile +15 -15
  5. data/{Todo.txt → Todo.rdoc} +0 -0
  6. data/VERSION.yml +1 -1
  7. data/lib/buildtasks/manifest.rake +11 -4
  8. data/lib/buildtasks/target.rake +20 -23
  9. data/lib/frameworks/sproutcore/CHANGELOG.md +36 -0
  10. data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js +2 -42
  11. data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/bind.js +2 -1
  12. data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/collection.js +3 -1
  13. data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/checkbox_support.js +5 -5
  14. data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/text_field_support.js +29 -12
  15. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/event.js +4 -4
  16. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/template_helpers/text_field_support.js +9 -0
  17. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/collection.js +110 -0
  18. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template_collection.js +63 -26
  19. data/lib/frameworks/sproutcore/frameworks/datastore/system/child_array.js +25 -5
  20. data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js +3 -3
  21. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js +26 -3
  22. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/record_array/core_methods.js +74 -53
  23. data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +6 -7
  24. data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +6 -3
  25. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js +25 -1
  26. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js +1 -3
  27. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js +20 -1
  28. data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js +1 -1
  29. data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js +46 -49
  30. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/ui.js +23 -0
  31. data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js +14 -2
  32. data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffered.js +2 -76
  33. data/lib/frameworks/sproutcore/frameworks/jquery/jquery.js +3348 -1591
  34. data/lib/frameworks/sproutcore/frameworks/runtime/core.js +25 -5
  35. data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js +0 -3
  36. data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/objectForPropertyPath.js +10 -5
  37. data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/requiredObjectForPropertyPath.js +29 -0
  38. data/lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue.js +98 -0
  39. data/lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list_item.css +2 -2
  40. data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css +1 -1
  41. data/lib/gen/language/Buildfile +1 -1
  42. data/lib/sproutcore.rb +1 -14
  43. data/lib/sproutcore/buildfile/string_ext.rb +0 -4
  44. data/lib/sproutcore/helpers/cssmin.rb +44 -59
  45. data/lib/sproutcore/helpers/text_helper.rb +11 -13
  46. data/lib/sproutcore/models/manifest.rb +4 -4
  47. data/lib/sproutcore/models/target.rb +11 -110
  48. data/lib/sproutcore/rack.rb +0 -1
  49. data/lib/sproutcore/rack/dev.rb +0 -1
  50. data/lib/sproutcore/rack/proxy.rb +9 -8
  51. data/lib/sproutcore/rack/service.rb +1 -1
  52. data/lib/sproutcore/render_engines/haml.rb +2 -5
  53. data/lib/sproutcore/tools/build.rb +2 -0
  54. data/lib/sproutcore/tools/docs.rb +7 -36
  55. data/lib/sproutcore/tools/manifest.rb +1 -1
  56. data/spec/buildtasks/target_spec.rb +9 -0
  57. data/spec/fixtures/real_world/frameworks/sproutcore/Buildfile +1 -1
  58. data/sproutcore.gemspec +3 -4
  59. data/vendor/chance/lib/chance/instance.rb +5 -8
  60. metadata +41 -207
  61. data/lib/doc_templates/jsdoc/allclasses.tmpl +0 -17
  62. data/lib/doc_templates/jsdoc/allfiles.tmpl +0 -56
  63. data/lib/doc_templates/jsdoc/class.tmpl +0 -487
  64. data/lib/doc_templates/jsdoc/index.tmpl +0 -38
  65. data/lib/doc_templates/jsdoc/publish.js +0 -170
  66. data/lib/doc_templates/jsdoc/static/default.css +0 -162
  67. data/lib/doc_templates/jsdoc/static/header.html +0 -2
  68. data/lib/doc_templates/jsdoc/static/index.html +0 -19
  69. data/lib/doc_templates/jsdoc/symbol.tmpl +0 -35
  70. data/lib/doc_templates/sproutcore/allclasses.tmpl +0 -0
  71. data/lib/doc_templates/sproutcore/allfiles.tmpl +0 -56
  72. data/lib/doc_templates/sproutcore/class.tmpl +0 -674
  73. data/lib/doc_templates/sproutcore/classes-json.tmpl +0 -55
  74. data/lib/doc_templates/sproutcore/index.tmpl +0 -62
  75. data/lib/doc_templates/sproutcore/publish.js +0 -346
  76. data/lib/doc_templates/sproutcore/static/default.css +0 -258
  77. data/lib/doc_templates/sproutcore/static/header.html +0 -2
  78. data/lib/doc_templates/sproutcore/static/index.html +0 -19
  79. data/lib/doc_templates/sproutcore/symbol.tmpl +0 -35
  80. data/lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue/isObservingSuspended.js +0 -55
  81. data/lib/sproutcore/rack/docs.rb +0 -24
  82. data/spec/fixtures/real_world/frameworks/sproutcore/apps/docs/PLACEHOLDER +0 -0
  83. data/vendor/jsdoc/README.txt +0 -151
  84. data/vendor/jsdoc/app/frame.js +0 -33
  85. data/vendor/jsdoc/app/frame/Chain.js +0 -102
  86. data/vendor/jsdoc/app/frame/Dumper.js +0 -144
  87. data/vendor/jsdoc/app/frame/Hash.js +0 -47
  88. data/vendor/jsdoc/app/frame/Link.js +0 -142
  89. data/vendor/jsdoc/app/frame/Namespace.js +0 -10
  90. data/vendor/jsdoc/app/frame/Opt.js +0 -134
  91. data/vendor/jsdoc/app/frame/Reflection.js +0 -26
  92. data/vendor/jsdoc/app/frame/String.js +0 -93
  93. data/vendor/jsdoc/app/frame/Testrun.js +0 -129
  94. data/vendor/jsdoc/app/handlers/FOODOC.js +0 -26
  95. data/vendor/jsdoc/app/handlers/XMLDOC.js +0 -26
  96. data/vendor/jsdoc/app/handlers/XMLDOC/DomReader.js +0 -159
  97. data/vendor/jsdoc/app/handlers/XMLDOC/XMLDoc.js +0 -16
  98. data/vendor/jsdoc/app/handlers/XMLDOC/XMLParse.js +0 -292
  99. data/vendor/jsdoc/app/lib/JSDOC.js +0 -98
  100. data/vendor/jsdoc/app/lib/JSDOC/DocComment.js +0 -200
  101. data/vendor/jsdoc/app/lib/JSDOC/DocTag.js +0 -294
  102. data/vendor/jsdoc/app/lib/JSDOC/JsDoc.js +0 -162
  103. data/vendor/jsdoc/app/lib/JSDOC/JsPlate.js +0 -100
  104. data/vendor/jsdoc/app/lib/JSDOC/Lang.js +0 -144
  105. data/vendor/jsdoc/app/lib/JSDOC/Parser.js +0 -109
  106. data/vendor/jsdoc/app/lib/JSDOC/PluginManager.js +0 -33
  107. data/vendor/jsdoc/app/lib/JSDOC/Symbol.js +0 -681
  108. data/vendor/jsdoc/app/lib/JSDOC/SymbolSet.js +0 -226
  109. data/vendor/jsdoc/app/lib/JSDOC/TextStream.js +0 -41
  110. data/vendor/jsdoc/app/lib/JSDOC/Token.js +0 -18
  111. data/vendor/jsdoc/app/lib/JSDOC/TokenReader.js +0 -332
  112. data/vendor/jsdoc/app/lib/JSDOC/TokenStream.js +0 -133
  113. data/vendor/jsdoc/app/lib/JSDOC/Util.js +0 -32
  114. data/vendor/jsdoc/app/lib/JSDOC/Walker.js +0 -453
  115. data/vendor/jsdoc/app/main.js +0 -74
  116. data/vendor/jsdoc/app/plugins/commentSrcJson.js +0 -19
  117. data/vendor/jsdoc/app/plugins/frameworkPrototype.js +0 -16
  118. data/vendor/jsdoc/app/plugins/functionCall.js +0 -10
  119. data/vendor/jsdoc/app/plugins/publishSrcHilite.js +0 -62
  120. data/vendor/jsdoc/app/plugins/sproutcoreTags.js +0 -26
  121. data/vendor/jsdoc/app/plugins/symbolLink.js +0 -9
  122. data/vendor/jsdoc/app/plugins/tagParamConfig.js +0 -31
  123. data/vendor/jsdoc/app/plugins/tagSynonyms.js +0 -43
  124. data/vendor/jsdoc/app/run.js +0 -346
  125. data/vendor/jsdoc/app/t/TestDoc.js +0 -144
  126. data/vendor/jsdoc/app/t/runner.js +0 -13
  127. data/vendor/jsdoc/app/test.js +0 -304
  128. data/vendor/jsdoc/app/test/addon.js +0 -24
  129. data/vendor/jsdoc/app/test/anon_inner.js +0 -14
  130. data/vendor/jsdoc/app/test/augments.js +0 -31
  131. data/vendor/jsdoc/app/test/augments2.js +0 -26
  132. data/vendor/jsdoc/app/test/borrows.js +0 -41
  133. data/vendor/jsdoc/app/test/borrows2.js +0 -23
  134. data/vendor/jsdoc/app/test/config.js +0 -22
  135. data/vendor/jsdoc/app/test/constructs.js +0 -18
  136. data/vendor/jsdoc/app/test/encoding.js +0 -10
  137. data/vendor/jsdoc/app/test/encoding_other.js +0 -12
  138. data/vendor/jsdoc/app/test/functions_anon.js +0 -39
  139. data/vendor/jsdoc/app/test/functions_nested.js +0 -33
  140. data/vendor/jsdoc/app/test/global.js +0 -13
  141. data/vendor/jsdoc/app/test/globals.js +0 -25
  142. data/vendor/jsdoc/app/test/ignore.js +0 -10
  143. data/vendor/jsdoc/app/test/inner.js +0 -16
  144. data/vendor/jsdoc/app/test/jsdoc_test.js +0 -477
  145. data/vendor/jsdoc/app/test/lend.js +0 -33
  146. data/vendor/jsdoc/app/test/memberof.js +0 -20
  147. data/vendor/jsdoc/app/test/memberof_constructor.js +0 -15
  148. data/vendor/jsdoc/app/test/name.js +0 -19
  149. data/vendor/jsdoc/app/test/namespace_nested.js +0 -23
  150. data/vendor/jsdoc/app/test/nocode.js +0 -13
  151. data/vendor/jsdoc/app/test/oblit_anon.js +0 -20
  152. data/vendor/jsdoc/app/test/overview.js +0 -20
  153. data/vendor/jsdoc/app/test/param_inline.js +0 -37
  154. data/vendor/jsdoc/app/test/params_optional.js +0 -8
  155. data/vendor/jsdoc/app/test/prototype.js +0 -17
  156. data/vendor/jsdoc/app/test/prototype_nested.js +0 -9
  157. data/vendor/jsdoc/app/test/prototype_oblit.js +0 -13
  158. data/vendor/jsdoc/app/test/prototype_oblit_constructor.js +0 -24
  159. data/vendor/jsdoc/app/test/public.js +0 -10
  160. data/vendor/jsdoc/app/test/shared.js +0 -42
  161. data/vendor/jsdoc/app/test/shared2.js +0 -2
  162. data/vendor/jsdoc/app/test/shortcuts.js +0 -22
  163. data/vendor/jsdoc/app/test/static_this.js +0 -13
  164. data/vendor/jsdoc/app/test/synonyms.js +0 -23
  165. data/vendor/jsdoc/app/test/tosource.js +0 -23
  166. data/vendor/jsdoc/app/test/variable_redefine.js +0 -14
  167. data/vendor/jsdoc/changes.txt +0 -47
  168. data/vendor/jsdoc/conf/sample.conf +0 -31
  169. data/vendor/jsdoc/java/build.xml +0 -36
  170. data/vendor/jsdoc/java/build_1.4.xml +0 -36
  171. data/vendor/jsdoc/java/classes/js.jar +0 -0
  172. data/vendor/jsdoc/java/src/JsDebugRun.java +0 -21
  173. data/vendor/jsdoc/java/src/JsRun.java +0 -21
  174. data/vendor/jsdoc/jsdebug.jar +0 -0
  175. data/vendor/jsdoc/jsrun.jar +0 -0
  176. data/vendor/jsdoc/t/TestDoc.js +0 -144
  177. data/vendor/jsdoc/t/runner.js +0 -13
  178. data/vendor/jsdoc/test.js +0 -304
  179. data/vendor/jsdoc/test/addon.js +0 -24
  180. data/vendor/jsdoc/test/anon_inner.js +0 -14
  181. data/vendor/jsdoc/test/augments.js +0 -31
  182. data/vendor/jsdoc/test/augments2.js +0 -26
  183. data/vendor/jsdoc/test/borrows.js +0 -41
  184. data/vendor/jsdoc/test/borrows2.js +0 -23
  185. data/vendor/jsdoc/test/config.js +0 -22
  186. data/vendor/jsdoc/test/constructs.js +0 -18
  187. data/vendor/jsdoc/test/encoding.js +0 -10
  188. data/vendor/jsdoc/test/encoding_other.js +0 -12
  189. data/vendor/jsdoc/test/functions_anon.js +0 -39
  190. data/vendor/jsdoc/test/functions_nested.js +0 -33
  191. data/vendor/jsdoc/test/global.js +0 -13
  192. data/vendor/jsdoc/test/globals.js +0 -25
  193. data/vendor/jsdoc/test/ignore.js +0 -10
  194. data/vendor/jsdoc/test/inner.js +0 -16
  195. data/vendor/jsdoc/test/jsdoc_test.js +0 -477
  196. data/vendor/jsdoc/test/lend.js +0 -33
  197. data/vendor/jsdoc/test/memberof.js +0 -20
  198. data/vendor/jsdoc/test/memberof_constructor.js +0 -15
  199. data/vendor/jsdoc/test/name.js +0 -19
  200. data/vendor/jsdoc/test/namespace_nested.js +0 -23
  201. data/vendor/jsdoc/test/nocode.js +0 -13
  202. data/vendor/jsdoc/test/oblit_anon.js +0 -20
  203. data/vendor/jsdoc/test/overview.js +0 -20
  204. data/vendor/jsdoc/test/param_inline.js +0 -37
  205. data/vendor/jsdoc/test/params_optional.js +0 -8
  206. data/vendor/jsdoc/test/prototype.js +0 -17
  207. data/vendor/jsdoc/test/prototype_nested.js +0 -9
  208. data/vendor/jsdoc/test/prototype_oblit.js +0 -13
  209. data/vendor/jsdoc/test/prototype_oblit_constructor.js +0 -24
  210. data/vendor/jsdoc/test/public.js +0 -10
  211. data/vendor/jsdoc/test/shared.js +0 -42
  212. data/vendor/jsdoc/test/shared2.js +0 -2
  213. data/vendor/jsdoc/test/shortcuts.js +0 -22
  214. data/vendor/jsdoc/test/static_this.js +0 -13
  215. data/vendor/jsdoc/test/synonyms.js +0 -23
  216. data/vendor/jsdoc/test/tosource.js +0 -23
  217. data/vendor/jsdoc/test/variable_redefine.js +0 -14
data/CHANGELOG CHANGED
@@ -1,3 +1,34 @@
1
+ *SproutCore 1.6.0.rc.2 (May 23, 2011)*
2
+
3
+ * Allow for absolute build_prefix
4
+ * We don't need to split for windows
5
+ * Fixed language generator - Fixes #44
6
+ * Fixed CLI --target flag
7
+ * Makes code less readable is more like it!
8
+ * We don't need this hack anymore
9
+ * simplified ruby compatibility code in lib/sproutcore.rb
10
+ * Soften dependencies to allow use SproutCore in Rails 3.1
11
+ * Don't hash SCSS paths after all, instead santize
12
+ * Don't need a check, the gem requires haml
13
+ * Compass requires chunky_png
14
+ * cleaned up a few return calls on methods of helpers/text_helper
15
+ * refactored textilize method in helpers/text_helper
16
+ * refactored textilize_without_paragraph method in helpers/text_helper
17
+ * Removed documentation tools, use sc-docs gem instead
18
+ * Fixed issue with default load files that broke modules
19
+ * Fixes to README
20
+ * Fixed the renamed History.txt and README.txt (to *.rdoc) in the Gemspec.
21
+ * Suffix History and Todo with .rdoc
22
+ * Renamed the README so that it displays nice on Github
23
+ * refactored do_misc method on helpers/cssmin
24
+ * Removed Rake release nopush option
25
+ * refactored shorten_colors method on helpers/cssmin
26
+ * refactored remove_spaces method on helpers/cssmin
27
+ * remove #replace_ext
28
+ * When the host or the port has changed, we should really redirect
29
+ * redefine the headers['Host'] every time
30
+ * removing the port from the address breaks any redirect which is not on port 80
31
+
1
32
  *SproutCore 1.6.0.rc.1 (May 16, 2011)*
2
33
 
3
34
  * More Rakefile improvements
@@ -5,28 +36,22 @@
5
36
  * Added get_allowed_keys to DRY up the retrieval of options
6
37
  * DRY up the init task
7
38
  * Added in sc-build args that were in documentation but not implemented - Fixes #429
8
- * Merge pull request #47 from drogus/script_name
9
39
  * Added copyright_block method to centralize template copyright generation
10
40
  * Commited missing fixtures for tests
11
41
  * Handle SCRIPT_NAME properly when sproutcore server is mounted
12
42
  * Fixed test name typos
13
43
  * Try to load APP_NAME.js in addition to core.js - Fixes #413
14
44
  * Updated haml and compass dependencies
15
- * Merge pull request #45 from gmoeck/master
16
- * Merge remote branch 'public/master'
17
45
  * Fixed issue where the javascript building got in a fight with the YUI compressor (I think). See http://i.imgur.com/xbxGO.png.
18
46
  * Less noisy RSpec
19
47
  * Rakefile release task
20
48
  * Add handlebars files to the entries
21
49
  * fixed bug in the require of generated models
22
- * Merged with public/msater
23
50
  * Adding touch_enabled flag to avoid having the touch icons included (default is still true)
24
51
  * Correct behavior of sc_require in Chance.
25
52
  * Made modules SC.Objects instead of just hashes
26
- * Merge remote-tracking branch 'public/master'
27
53
  * Fix to chance to avoid a Windows error
28
54
  * Change jQuery.ready() to SC.ready() in HTML template, which allows SC.RootResponder to attach event listeners before the app runs.
29
- * Merge remote branch 'public/master'
30
55
  * Changed the generators so they create more descriptive names. Before, we had lots of files with the same name, which was confusing in editors and in the webkit inspector. This solves that problem.
31
56
  * Adding timestamp to sc-build logger, thanks Tony Sung
32
57
 
File without changes
@@ -1,7 +1,8 @@
1
- sproutcore - abbot
1
+ = sproutcore - abbot
2
+
2
3
  by Charles Jolley and contributors
3
4
  http://www.sproutcore.com
4
- http://github.com/sproutit/sproutcore-abbot
5
+ http://github.com/sproutcore/sproutcore-abbot
5
6
 
6
7
  == DESCRIPTION:
7
8
 
data/Rakefile CHANGED
@@ -25,14 +25,14 @@ To get the SproutCore framework, run
25
25
  To update the gem:
26
26
 
27
27
  - Update VERSION.yml
28
- - Run `rake release:all` on Mac OS X or Linux
28
+ - Run `rake release:prepare` on Mac OS X or Linux
29
29
  This updates the CHANGELOGS for both framework and abbot,
30
30
  updates version numbers and tags them. It also builds and
31
31
  pushes gems. If you just want to see what it does, pass
32
32
  PRETEND=1 to make no actual changes.
33
33
  For best results you should have RVM with MRI Ruby and JRuby installed.
34
- - Once you have verified your changes, run `rake release:push`.
35
- - On Windows, update the repos and run `rake release:gems:all`
34
+ - Once you have verified your changes, run `rake release:deploy`.
35
+ - On Windows, update the repos and run `rake release:gems:deploy`
36
36
  - To create installer packages, run `rake pkg` on Mac OS X and Windows
37
37
 
38
38
  END
@@ -79,10 +79,6 @@ namespace :release do
79
79
  ENV['PRETEND']
80
80
  end
81
81
 
82
- def nopush?
83
- ENV['NOPUSH']
84
- end
85
-
86
82
  namespace :framework do
87
83
 
88
84
  task :chdir do
@@ -147,7 +143,7 @@ namespace :release do
147
143
 
148
144
  task :push => :chdir do
149
145
  puts "Pushing Repo"
150
- unless pretend? || nopush?
146
+ unless pretend?
151
147
  print "Are you sure you want to push the framework repo to github? (y/N) "
152
148
  res = STDIN.gets.chomp
153
149
  if res == 'y'
@@ -159,7 +155,8 @@ namespace :release do
159
155
  end
160
156
  end
161
157
 
162
- task :all => [:update, :changelog, :update_references, :commit, :tag]
158
+ task :prepare => [:update, :changelog, :update_references]
159
+ task :deploy => [:commit, :tag, :push]
163
160
 
164
161
  end
165
162
 
@@ -188,6 +185,7 @@ namespace :release do
188
185
  File.open('CHANGELOG', 'r+') do |file|
189
186
  current = file.read
190
187
  file.pos = 0;
188
+ file.puts output
191
189
  file.puts current
192
190
  end
193
191
  else
@@ -211,7 +209,7 @@ namespace :release do
211
209
 
212
210
  task :push => :chdir do
213
211
  puts "Pushing Repo"
214
- unless pretend? || nopush?
212
+ unless pretend?
215
213
  print "Are you sure you want to push the abbot repo to github? (y/N) "
216
214
  res = STDIN.gets.chomp
217
215
  if res == 'y'
@@ -223,7 +221,8 @@ namespace :release do
223
221
  end
224
222
  end
225
223
 
226
- task :all => [:update, :changelog, :commit, :tag]
224
+ task :prepare => [:update, :changelog]
225
+ task :deploy => [:commit, :tag, :push]
227
226
 
228
227
  end
229
228
 
@@ -243,7 +242,7 @@ namespace :release do
243
242
  task :push do
244
243
  Dir["sproutcore-#{version}*.gem"].each do |g|
245
244
  puts "Pushing #{g}"
246
- unless pretend? || nopush?
245
+ unless pretend?
247
246
  print "Are you sure you want to push the gem to RubyGems.org? (y/N) "
248
247
  res = STDIN.gets.chomp
249
248
  if res == 'y'
@@ -255,11 +254,12 @@ namespace :release do
255
254
  end
256
255
  end
257
256
 
258
- task :all => [:build]
257
+ task :prepare => []
258
+ task :deploy => [:build, :push]
259
259
 
260
260
  end
261
261
 
262
- task :all => ["framework:all", "abbot:all", "gems:all"]
263
- task :push => ["framework:push", "abbot:push", "gems:push"]
262
+ task :prepare => ["framework:prepare", "abbot:prepare", "gems:prepare"]
263
+ task :deploy => ["framework:deploy", "abbot:deploy", "gems:deploy"]
264
264
 
265
265
  end
File without changes
data/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 1
3
3
  :minor: 6
4
- :patch: 0.rc.1
4
+ :patch: 0.rc.2
@@ -605,10 +605,17 @@ namespace :manifest do
605
605
  # build combined JS entry
606
606
  javascript_entries.each do |resource_name, entries|
607
607
  resource_name = resource_name.ext('js')
608
- target_name = manifest.target.target_name.to_s.split('/')[-1]
609
- pf = (resource_name == 'javascript.js') ?
610
- ['source/lproj/strings.js', 'source/core.js', "source/#{target_name}.js", 'source/utils.js'] :
611
- []
608
+
609
+ if resource_name == 'javascript.js'
610
+ pf = ['source/lproj/strings.js', 'source/core.js', 'source/utils.js']
611
+ if manifest.target.target_type == :app
612
+ target_name = manifest.target.target_name.to_s.split('/')[-1]
613
+ pf.insert(2, "source/#{target_name}.js")
614
+ end
615
+ else
616
+ pf = []
617
+ end
618
+
612
619
  manifest.add_composite resource_name,
613
620
  :build_task => 'build:combine',
614
621
  :source_entries => entries,
@@ -33,29 +33,26 @@ namespace :target do
33
33
  target[:index_root] = url
34
34
  end
35
35
 
36
- url_prefix = config[:url_prefix]
37
- url_prefix = url_prefix.gsub(/^[^\/]+:\/\/[^\/]+\//,'') if url_prefix
38
-
39
- # Split all of these paths in case we are on windows...
40
- target[:build_root] = File.expand_path(config[:build_root] ||
41
- File.join(project.project_root.to_s,
42
- (config[:build_prefix] || '').to_s.split('/'),
43
- (url_prefix || '').to_s.split('/'),
44
- target[:target_name].to_s.split('/')))
45
-
46
-
47
- target[:staging_root] = File.expand_path(config[:staging_root] ||
48
- File.join(project.project_root.to_s,
49
- (config[:staging_prefix] || '').to_s.split('/'),
50
- (url_prefix || '').to_s.split('/'),
51
- target[:target_name].to_s))
52
-
53
- # cache is used to store intermediate files
54
- target[:cache_root] = File.expand_path(config[:cache_root] ||
55
- File.join(project.project_root.to_s,
56
- (config[:cache_prefix] || '').to_s.split('/'),
57
- (url_prefix || '').to_s.split('/'),
58
- target[:target_name].to_s))
36
+ url_prefix = (config[:url_prefix] || '').gsub(/^[^\/]+:\/\/[^\/]+\//,'')
37
+
38
+ # Set up root paths
39
+ %w(build staging cache).each do |type|
40
+ root_key = "#{type}_root".to_sym
41
+ root = config[root_key]
42
+ prefix = config["#{type}_prefix".to_sym]
43
+
44
+ path = root
45
+ unless path
46
+ base = prefix || ''
47
+ # Check if it's absolute, if not add project_root
48
+ unless base[0..0] == '~' || File.absolute_path(base) == base
49
+ base = File.join((project.project_root || '').to_s, base)
50
+ end
51
+ path = File.join(base, url_prefix, (target[:target_name] || '').to_s)
52
+ end
53
+
54
+ target[root_key] = File.expand_path(path)
55
+ end
59
56
 
60
57
  target[:build_number] = target.compute_build_number
61
58
 
@@ -1,6 +1,42 @@
1
1
  CHANGE LOG FOR 1.6
2
2
  ==================
3
3
 
4
+ 1.6.0.rc.2
5
+ ----------
6
+ * Fixed SC.PickerPane#modalPaneDidClick return values - Fixes #339
7
+ * Fixed SC.Enumerable fallback for SC.RecordArray#find - Fixes #363
8
+ * Added SC.requiredObjectForPropertyPath that throws an error when object can't be found
9
+ * Make it possible for the handlebars helpers to generate tags other than <span>
10
+ * Improved Observer Tests with better location (thx martoche)
11
+ * Fixed disclosure positioning in Ace, fixes #457
12
+ * Added backslash to prevent SASS comment interpolation warning
13
+ * Allow for passing relative paths to #collection helper.
14
+ * Further cleanup to TextField template multiline
15
+ * Added isMultiline property to SC.TextField.
16
+ * jQuery is now smart enough to take booleans for certain attributes
17
+ * Stop using jQuery expando
18
+ * Added unit tests for SC.ContainerView to verify it cleans up views that it instantiates.
19
+ * SC.ContainerView will instantiate it's contentView if nowShowing is set with a string or class, however it was not cleaning up views when it was finished. Now it keeps track and cleans up when necessary.
20
+ * Unit test for previous commit checking that the themeName got passed through to the buttons.
21
+ * Allow you to set themeName on the AlertPane to also set the themeName on the buttons (which were previously stuck as 'capsule')
22
+ * Unit test for previous commit adding controlSize to TabView + removed useless TabView methods test and left a warning unit test instead.
23
+ * Whitespace + allow setting of controlSize
24
+ * Comment typo forEachIndex is not a function in IndexSet
25
+ * fix jQuery/SC conflict for events handeling add tryToPerform on SC.TextField
26
+ * use prop instead of attr in SC.Checkbox replace SC.data with jQuery.data
27
+ * remove more code : passing unit tests but fail in real app
28
+ * upgrade to jquery 1.6 use jQuery.sub()
29
+ * Minor adjustments for docs
30
+ * fixed so that replace on ChildArray only notifies the part of the array that has actually changed
31
+ * remove more code : passing unit tests but fail in real app
32
+ * upgrade to jquery 1.6 use jQuery.sub()
33
+ * Hacky solution to the issue where template collection views render their item views multiple times when they are nested inside another template collection view.
34
+ * Adds support for specifying an inverse template name to template collection view.
35
+ * Adds unit tests for using an inverse template in template collection views.
36
+ * Fixes issue with nested template collection views causing childViews array to get messed up.
37
+ * Adds failing unit test for childView structure of nested collection views.
38
+ * Adds unit tests for checking the number of items rendered in nested collection views with default content.
39
+
4
40
  1.6.0.rc.1
5
41
  ----------
6
42
  * Added 'Show Progress' checkbox to Test Runner
@@ -107,23 +107,7 @@ SC.mixin(/** @lends SC */ {
107
107
  @param data {Object} Optional data. If passed, write.
108
108
  @returns {Object} the value of the named data
109
109
  */
110
- data: function(elem, name, data) {
111
- elem = (elem === window) ? "@window" : elem ;
112
- var hash = SC.hashFor(elem) ; // get the hash key
113
-
114
- // Generate the data cache if needed
115
- var cache = SC._data_cache ;
116
- if (!cache) SC._data_cache = cache = {} ;
117
-
118
- // Now get cache for element
119
- var elemCache = cache[hash] ;
120
- if (name && !elemCache) cache[hash] = elemCache = {} ;
121
-
122
- // Write data if provided
123
- if (elemCache && (data !== undefined)) elemCache[name] = data ;
124
-
125
- return (name) ? elemCache[name] : elemCache ;
126
- },
110
+ data: $.data,
127
111
 
128
112
  /**
129
113
  Removes data from the global cache. This is used throughout the
@@ -136,31 +120,7 @@ SC.mixin(/** @lends SC */ {
136
120
  @param name {String} optional name to remove.
137
121
  @returns {Object} the value or cache that was removed
138
122
  */
139
- removeData: function(elem, name) {
140
- elem = (elem === window) ? "@window" : elem ;
141
- var hash = SC.hashFor(elem) ;
142
-
143
- // return undefined if no cache is defined
144
- var cache = SC._data_cache ;
145
- if (!cache) return undefined ;
146
-
147
- // return undefined if the elem cache is undefined
148
- var elemCache = cache[hash] ;
149
- if (!elemCache) return undefined;
150
-
151
- // get the return value
152
- var ret = (name) ? elemCache[name] : elemCache ;
153
-
154
- // and delete as appropriate
155
- if (name) {
156
- delete elemCache[name] ;
157
- } else {
158
- delete cache[hash] ;
159
- }
160
-
161
- return ret ;
162
- },
163
-
123
+ removeData: $.removeData,
164
124
 
165
125
  // ..........................................................
166
126
  // LOCALIZATION SUPPORT
@@ -51,7 +51,8 @@ sc_require('ext/handlebars');
51
51
  displayTemplate: fn,
52
52
  inverseTemplate: inverse,
53
53
  property: property,
54
- previousContext: this
54
+ previousContext: this,
55
+ tagName: (options.hash.tagName || "span")
55
56
  });
56
57
 
57
58
  var observer, invoker;
@@ -9,7 +9,9 @@ Handlebars.registerHelper('collection', function(path, options) {
9
9
  var hash = options.hash;
10
10
  var collectionClass, collectionObject;
11
11
 
12
- collectionClass = path ? SC.objectForPropertyPath(path) : SC.TemplateCollectionView;
12
+ collectionClass = path ? SC.getPath(this, path) || SC.getPath(path) :
13
+ SC.TemplateCollectionView;
14
+
13
15
  // @if (debug)
14
16
  if (!collectionClass) {
15
17
  throw "%@ #collection: Could not find %@".fmt(data.view, path);
@@ -27,14 +27,14 @@ SC.Checkbox = SC.TemplateView.extend(
27
27
  },
28
28
 
29
29
  domValueDidChange: function(node) {
30
- this.set('value', !!$(node).attr('checked'));
30
+ this.set('value', $(node).prop('checked'));
31
31
  },
32
32
 
33
33
  value: function(key, value) {
34
34
  if (value !== undefined) {
35
- this.$('input').attr('checked', value);
35
+ this.$('input').prop('checked', value);
36
36
  } else {
37
- value = this.$('input').attr('checked');
37
+ value = this.$('input').prop('checked');
38
38
  }
39
39
 
40
40
  return value;
@@ -52,9 +52,9 @@ SC.CheckboxSupport = /** @scope SC.CheckboxSupport */{
52
52
 
53
53
  value: function(key, value) {
54
54
  if (value !== undefined) {
55
- this.$('input').attr('checked', value);
55
+ this.$('input').prop('checked', value);
56
56
  } else {
57
- value = this.$('input').attr('checked');
57
+ value = this.$('input').prop('checked');
58
58
  }
59
59
 
60
60
  return value;
@@ -14,6 +14,15 @@ SC.TextField = SC.TemplateView.extend(
14
14
 
15
15
  classNames: ['sc-text-field'],
16
16
 
17
+ /**
18
+ If set to `YES` uses textarea tag instead of input to
19
+ accommodate multi-line strings.
20
+
21
+ @type Boolean
22
+ @default NO
23
+ */
24
+ isMultiline: NO,
25
+
17
26
  // we can't use bindAttr because of a race condition:
18
27
  //
19
28
  // when `value` is set, the bindAttr observer immediately calls
@@ -25,18 +34,25 @@ SC.TextField = SC.TemplateView.extend(
25
34
  // In short, because we need to be able to catch changes to the
26
35
  // DOM made directly, we cannot also rely on bindAttr to update
27
36
  // the property: a chicken-and-egg problem.
28
- template: SC.Handlebars.compile('<input type="text">'),
37
+ template: function(){
38
+ return SC.Handlebars.compile(this.get('isMultiline') ? '<textarea></textarea>' : '<input type="text">');
39
+ }.property('isMultiline').cacheable(),
40
+
41
+ $input: function() {
42
+ tagName = this.get('isMultiline') ? 'textarea' : 'input';
43
+ return this.$(tagName);
44
+ },
29
45
 
30
46
  didCreateLayer: function() {
31
47
  var self = this;
32
48
 
33
- var input = this.$('input');
49
+ var input = this.$input();
34
50
  input.val(this._value);
35
51
 
36
52
  SC.Event.add(input, 'focus', this, this.focusIn);
37
53
  SC.Event.add(input, 'blur', this, this.focusOut);
38
54
 
39
- this.$('input').bind('change', function() {
55
+ input.bind('change', function() {
40
56
  self.domValueDidChange(SC.$(this));
41
57
  });
42
58
  },
@@ -58,7 +74,7 @@ SC.TextField = SC.TemplateView.extend(
58
74
  the underlying DOM element is created.
59
75
  */
60
76
  value: function(key, value) {
61
- var input = this.$('input');
77
+ var input = this.$input();
62
78
 
63
79
  if (value !== undefined) {
64
80
  this._value = value;
@@ -91,16 +107,17 @@ SC.TextField = SC.TemplateView.extend(
91
107
  },
92
108
 
93
109
  keyUp: function(evt) {
94
- this.domValueDidChange(this.$('input'));
110
+ this.domValueDidChange(this.$input());
95
111
 
96
- if (evt.keyCode === 13) {
97
- return this.insertNewline(evt);
98
- } else if (evt.keyCode === 27) {
99
- return this.cancel(evt);
112
+ if (evt.keyCode === SC.Event.KEY_RETURN) {
113
+ return this.tryToPerform('insertNewline', evt);
114
+ } else if (evt.keyCode === SC.Event.KEY_ESC) {
115
+ return this.tryToPerform('cancel', evt);
100
116
  }
101
117
 
102
118
  return true;
103
119
  }
120
+
104
121
  });
105
122
 
106
123
  SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
@@ -109,7 +126,7 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
109
126
  Used internally to store value because the layer may not exist
110
127
  */
111
128
  _value: null,
112
-
129
+
113
130
  /**
114
131
  @type String
115
132
  @default null
@@ -162,9 +179,9 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
162
179
  },
163
180
 
164
181
  keyUp: function(event) {
165
- if (event.keyCode === 13) {
182
+ if (event.keyCode === SC.Event.KEY_RETURN) {
166
183
  return this.tryToPerform('insertNewline', event);
167
- } else if (event.keyCode === 27) {
184
+ } else if (event.keyCode === SC.Event.KEY_ESC) {
168
185
  return this.tryToPerform('cancel', event);
169
186
  }
170
187
  }