riojs 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/public/images/sub-menu-indicator.png +0 -0
- data/public/javascripts/components/alert_box.js +34 -24
- data/public/javascripts/components/grid_view.js +32 -10
- data/public/javascripts/components/input.js +6 -0
- data/public/javascripts/components/lightbox.js +137 -141
- data/public/javascripts/components/list_view.js +2 -2
- data/public/javascripts/components/menu.js +93 -50
- data/public/javascripts/components/overlay.js +117 -118
- data/public/javascripts/components/popup.js +213 -0
- data/public/javascripts/components/toggle_button.js +3 -2
- data/public/javascripts/lib/console/docs/files.html +1 -1
- data/public/javascripts/lib/console/docs/index.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/Object.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/_global_.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Application.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Attr.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Binding.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Component.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Cookie.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.DelayedTask#initialize.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.DelayedTask.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.JsTemplate.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Juggernaut.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Model.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Page.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.Utils.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/rio.html +1 -1
- data/public/javascripts/lib/console/docs/symbols/src/public_javascripts_lib_model.js.html +506 -493
- data/public/javascripts/lib/console/docs/symbols/src/public_javascripts_lib_page.js.html +5 -5
- data/public/javascripts/lib/console/docs/symbols/src/public_javascripts_lib_protohack.js.html +126 -123
- data/public/javascripts/lib/model.js +18 -5
- data/public/javascripts/lib/page.js +5 -5
- data/public/javascripts/lib/protohack.js +12 -9
- data/public/javascripts/specs/lib/model_spec.js +13 -0
- data/public/stylesheets/components/alert_box.css +5 -1
- data/public/stylesheets/components/menu.css +17 -17
- data/public/stylesheets/components/popup.css +18 -0
- metadata +5 -2
|
@@ -55,21 +55,21 @@
|
|
|
55
55
|
<span class='line'> 48</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
56
56
|
<span class='line'> 49</span>
|
|
57
57
|
<span class='line'> 50</span> </span><span class="NAME">popup</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
58
|
-
<span class='line'> 51</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">this.
|
|
59
|
-
<span class='line'> 52</span> </span><span class="NAME">this.
|
|
58
|
+
<span class='line'> 51</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">!</span><span class="NAME">this.__popup</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
59
|
+
<span class='line'> 52</span> </span><span class="NAME">this.__popup</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">rio.components.Popup</span><span class="PUNC">(</span><span class="PUNC">{</span><span class="WHIT">
|
|
60
60
|
<span class='line'> 53</span> </span><span class="NAME">content</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">this.html</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT">
|
|
61
61
|
<span class='line'> 54</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
62
62
|
<span class='line'> 55</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
63
|
-
<span class='line'> 56</span> </span><span class="NAME">this.
|
|
63
|
+
<span class='line'> 56</span> </span><span class="NAME">this.__popup.activate</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
64
64
|
<span class='line'> 57</span> </span><span class="NAME">this.render</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
65
65
|
<span class='line'> 58</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
66
66
|
<span class='line'> 59</span>
|
|
67
67
|
<span class='line'> 60</span> </span><span class="NAME">resizePopup</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
68
|
-
<span class='line'> 61</span> </span><span class="NAME">this.
|
|
68
|
+
<span class='line'> 61</span> </span><span class="NAME">this.__popup.resize</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
69
69
|
<span class='line'> 62</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
70
70
|
<span class='line'> 63</span>
|
|
71
71
|
<span class='line'> 64</span> </span><span class="NAME">closePopup</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">skipFade</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
72
|
-
<span class='line'> 65</span> </span><span class="NAME">this.
|
|
72
|
+
<span class='line'> 65</span> </span><span class="NAME">this.__popup.deactivate</span><span class="PUNC">(</span><span class="NAME">skipFade</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
73
73
|
<span class='line'> 66</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
74
74
|
<span class='line'> 67</span>
|
|
75
75
|
<span class='line'> 68</span> </span><span class="NAME">isManagingLayout</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
data/public/javascripts/lib/console/docs/symbols/src/public_javascripts_lib_protohack.js.html
CHANGED
|
@@ -170,136 +170,139 @@
|
|
|
170
170
|
<span class='line'>163</span>
|
|
171
171
|
<span class='line'>164</span> </span><span class="NAME">Object.extend</span><span class="PUNC">(</span><span class="NAME">Date.prototype</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
172
172
|
<span class='line'>165</span> </span><span class="NAME">strftime</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">format</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
173
|
-
<span class='line'>166</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">day</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.
|
|
174
|
-
<span class='line'>167</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.
|
|
173
|
+
<span class='line'>166</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">day</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.getDay</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">month</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.getMonth</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
174
|
+
<span class='line'>167</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.getHours</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">minutes</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.getMinutes</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
175
175
|
<span class='line'>168</span> </span><span class="KEYW">function</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">num</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">num.toPaddedString</span><span class="PUNC">(</span><span class="NUMB">2</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
176
176
|
<span class='line'>169</span>
|
|
177
|
-
<span class='line'>170</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">format.gsub</span><span class="PUNC">(</span><span class="REGX">/\%([
|
|
177
|
+
<span class='line'>170</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">format.gsub</span><span class="PUNC">(</span><span class="REGX">/\%([aAbBcdDeHiImMnpPSwyY])/</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">part</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
178
178
|
<span class='line'>171</span> </span><span class="KEYW">switch</span><span class="PUNC">(</span><span class="NAME">part</span><span class="PUNC">[</span><span class="NUMB">1</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
179
179
|
<span class='line'>172</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'a'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">$w</span><span class="PUNC">(</span><span class="STRN">"Sun Mon Tue Wed Thu Fri Sat"</span><span class="PUNC">)</span><span class="PUNC">[</span><span class="NAME">day</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
|
|
180
180
|
<span class='line'>173</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'A'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">$w</span><span class="PUNC">(</span><span class="STRN">"Sunday Monday Tuesday Wednesday Thursday Friday Saturday"</span><span class="PUNC">)</span><span class="PUNC">[</span><span class="NAME">day</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
|
|
181
181
|
<span class='line'>174</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'b'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">$w</span><span class="PUNC">(</span><span class="STRN">"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"</span><span class="PUNC">)</span><span class="PUNC">[</span><span class="NAME">month</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
|
|
182
182
|
<span class='line'>175</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'B'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">$w</span><span class="PUNC">(</span><span class="STRN">"January February March April May June July August September October November December"</span><span class="PUNC">)</span><span class="PUNC">[</span><span class="NAME">month</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
|
|
183
183
|
<span class='line'>176</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'c'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.toString</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
184
|
-
<span class='line'>177</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'d'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.
|
|
185
|
-
<span class='line'>178</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'D'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.
|
|
186
|
-
<span class='line'>179</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
187
|
-
<span class='line'>180</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
188
|
-
<span class='line'>181</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
189
|
-
<span class='line'>182</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
190
|
-
<span class='line'>183</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
191
|
-
<span class='line'>184</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
192
|
-
<span class='line'>185</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
193
|
-
<span class='line'>186</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
194
|
-
<span class='line'>187</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
195
|
-
<span class='line'>188</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'
|
|
196
|
-
<span class='line'>189</span>
|
|
197
|
-
<span class='line'>190</span>
|
|
198
|
-
<span class='line'>191</span>
|
|
199
|
-
<span class='line'>192</span>
|
|
200
|
-
<span class='line'>193</span>
|
|
201
|
-
<span class='line'>194</span>
|
|
202
|
-
<span class='line'>195</span>
|
|
203
|
-
<span class='line'>196</span>
|
|
204
|
-
<span class='line'>197</span>
|
|
205
|
-
<span class='line'>198</span> </span><span class="PUNC">
|
|
206
|
-
<span class='line'>199</span>
|
|
207
|
-
<span class='line'>200</span>
|
|
208
|
-
<span class='line'>201</span>
|
|
209
|
-
<span class='line'>202</span>
|
|
210
|
-
<span class='line'>203</span>
|
|
211
|
-
<span class='line'>204</span> </span><span class="
|
|
212
|
-
<span class='line'>205</span>
|
|
213
|
-
<span class='line'>206</span>
|
|
214
|
-
<span class='line'>207</span>
|
|
215
|
-
<span class='line'>208</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">
|
|
216
|
-
<span class='line'>209</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">
|
|
184
|
+
<span class='line'>177</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'d'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.getDate</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
185
|
+
<span class='line'>178</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'D'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.getDate</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
186
|
+
<span class='line'>179</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'e'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.getDate</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
187
|
+
<span class='line'>180</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'H'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">hours</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
188
|
+
<span class='line'>181</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'i'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">%</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="PUNC">;</span><span class="WHIT">
|
|
189
|
+
<span class='line'>182</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'I'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="PUNC">(</span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">%</span><span class="WHIT"> </span><span class="NUMB">12</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
190
|
+
<span class='line'>183</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'m'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">month</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
191
|
+
<span class='line'>184</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'M'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">minutes</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
192
|
+
<span class='line'>185</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'n'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">month</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">;</span><span class="WHIT">
|
|
193
|
+
<span class='line'>186</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'p'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">></span><span class="WHIT"> </span><span class="NUMB">11</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'PM'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'AM'</span><span class="PUNC">;</span><span class="WHIT">
|
|
194
|
+
<span class='line'>187</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'P'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">hours</span><span class="WHIT"> </span><span class="PUNC">></span><span class="WHIT"> </span><span class="NUMB">11</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="STRN">'pm'</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="STRN">'am'</span><span class="PUNC">;</span><span class="WHIT">
|
|
195
|
+
<span class='line'>188</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'S'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.getSeconds</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
196
|
+
<span class='line'>189</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'w'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">day</span><span class="PUNC">;</span><span class="WHIT">
|
|
197
|
+
<span class='line'>190</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'y'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">pad</span><span class="PUNC">(</span><span class="NAME">this.getFullYear</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">%</span><span class="WHIT"> </span><span class="NUMB">100</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
198
|
+
<span class='line'>191</span> </span><span class="KEYW">case</span><span class="WHIT"> </span><span class="STRN">'Y'</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.getFullYear</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toString</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
199
|
+
<span class='line'>192</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
200
|
+
<span class='line'>193</span> </span><span class="PUNC">}</span><span class="PUNC">.</span><span class="NAME">bind</span><span class="PUNC">(</span><span class="KEYW">this</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
201
|
+
<span class='line'>194</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
202
|
+
<span class='line'>195</span>
|
|
203
|
+
<span class='line'>196</span> </span><span class="NAME">prettyTime</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
204
|
+
<span class='line'>197</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.getHours</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">":"</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
|
|
205
|
+
<span class='line'>198</span> </span><span class="NAME">this.getMinutes</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toPaddedString</span><span class="PUNC">(</span><span class="NUMB">2</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">":"</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT">
|
|
206
|
+
<span class='line'>199</span> </span><span class="NAME">this.getSeconds</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toPaddedString</span><span class="PUNC">(</span><span class="NUMB">2</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
207
|
+
<span class='line'>200</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
208
|
+
<span class='line'>201</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
209
|
+
<span class='line'>202</span>
|
|
210
|
+
<span class='line'>203</span> </span><span class="NAME">Object.extend</span><span class="PUNC">(</span><span class="NAME">Date</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
211
|
+
<span class='line'>204</span> </span><span class="COMM">/*
|
|
212
|
+
<span class='line'>205</span> Adapted from (http://delete.me.uk/2005/03/iso8601.html)
|
|
213
|
+
<span class='line'>206</span> */</span><span class="WHIT">
|
|
214
|
+
<span class='line'>207</span> </span><span class="NAME">parseISO</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">string</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
215
|
+
<span class='line'>208</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">regexp</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="STRN">"([0-9]{4})(-([0-9]{2})(-([0-9]{2})(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(/.([0-9]+))?)?(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?"</span><span class="PUNC">;</span><span class="WHIT">
|
|
216
|
+
<span class='line'>209</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">d</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">string.match</span><span class="PUNC">(</span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">RegExp</span><span class="PUNC">(</span><span class="NAME">regexp</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
217
217
|
<span class='line'>210</span>
|
|
218
|
-
<span class='line'>211</span> </span><span class="KEYW">
|
|
219
|
-
<span class='line'>212</span> </span><span class="KEYW">
|
|
220
|
-
<span class='line'>213</span>
|
|
221
|
-
<span class='line'>214</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">
|
|
222
|
-
<span class='line'>215</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">
|
|
223
|
-
<span class='line'>216</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">
|
|
224
|
-
<span class='line'>217</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">
|
|
225
|
-
<span class='line'>218</span>
|
|
226
|
-
<span class='line'>219</span>
|
|
227
|
-
<span class='line'>220</span> </span><span class="PUNC">
|
|
228
|
-
<span class='line'>221</span>
|
|
229
|
-
<span class='line'>222</span>
|
|
230
|
-
<span class='line'>223</span> </span><span class="
|
|
231
|
-
<span class='line'>224</span>
|
|
232
|
-
<span class='line'>225</span>
|
|
233
|
-
<span class='line'>226</span>
|
|
234
|
-
<span class='line'>227</span>
|
|
235
|
-
<span class='line'>228</span>
|
|
236
|
-
<span class='line'>229</span>
|
|
237
|
-
<span class='line'>230</span>
|
|
238
|
-
<span class='line'>231</span>
|
|
239
|
-
<span class='line'>232</span>
|
|
240
|
-
<span class='line'>233</span>
|
|
241
|
-
<span class='line'>234</span>
|
|
242
|
-
<span class='line'>235</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">
|
|
243
|
-
<span class='line'>236</span>
|
|
218
|
+
<span class='line'>211</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">offset</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
|
|
219
|
+
<span class='line'>212</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">date</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">Date</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">1</span><span class="PUNC">]</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
220
|
+
<span class='line'>213</span>
|
|
221
|
+
<span class='line'>214</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">3</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setMonth</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">3</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">-</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
222
|
+
<span class='line'>215</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">5</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setDate</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">5</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
223
|
+
<span class='line'>216</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">7</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setHours</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">7</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
224
|
+
<span class='line'>217</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">8</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setMinutes</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">8</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
225
|
+
<span class='line'>218</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">10</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setSeconds</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">10</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
226
|
+
<span class='line'>219</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">12</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="NAME">date.setMilliseconds</span><span class="PUNC">(</span><span class="NAME">Number</span><span class="PUNC">(</span><span class="STRN">"0."</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">12</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">*</span><span class="WHIT"> </span><span class="NUMB">1000</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
227
|
+
<span class='line'>220</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">14</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
228
|
+
<span class='line'>221</span> </span><span class="NAME">offset</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">Number</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">16</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">*</span><span class="WHIT"> </span><span class="NUMB">60</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">Number</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">17</span><span class="PUNC">]</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
229
|
+
<span class='line'>222</span> </span><span class="NAME">offset</span><span class="WHIT"> </span><span class="PUNC">*</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="PUNC">(</span><span class="NAME">d</span><span class="PUNC">[</span><span class="NUMB">15</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">'-'</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="PUNC">-</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
230
|
+
<span class='line'>223</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
231
|
+
<span class='line'>224</span>
|
|
232
|
+
<span class='line'>225</span> </span><span class="COMM">// I had to add the * 2 to get it to work</span><span class="WHIT">
|
|
233
|
+
<span class='line'>226</span> </span><span class="NAME">offset</span><span class="WHIT"> </span><span class="PUNC">-</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">date.getTimezoneOffset</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
234
|
+
<span class='line'>227</span> </span><span class="NAME">time</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">Number</span><span class="PUNC">(</span><span class="NAME">date</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">offset</span><span class="WHIT"> </span><span class="PUNC">*</span><span class="WHIT"> </span><span class="NUMB">60</span><span class="WHIT"> </span><span class="PUNC">*</span><span class="WHIT"> </span><span class="NUMB">1000</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
235
|
+
<span class='line'>228</span>
|
|
236
|
+
<span class='line'>229</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="KEYW">new</span><span class="WHIT"> </span><span class="NAME">Date</span><span class="PUNC">(</span><span class="NAME">Number</span><span class="PUNC">(</span><span class="NAME">time</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
237
|
+
<span class='line'>230</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
238
|
+
<span class='line'>231</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
239
|
+
<span class='line'>232</span>
|
|
240
|
+
<span class='line'>233</span> </span><span class="NAME">Object.extend</span><span class="PUNC">(</span><span class="NAME">String.prototype</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
241
|
+
<span class='line'>234</span> </span><span class="NAME">camelize</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
242
|
+
<span class='line'>235</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.split</span><span class="PUNC">(</span><span class="REGX">/_|-/</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NAME">len</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">parts.length</span><span class="PUNC">;</span><span class="WHIT">
|
|
243
|
+
<span class='line'>236</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">len</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NUMB">0</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
244
244
|
<span class='line'>237</span>
|
|
245
|
-
<span class='line'>238</span> </span><span class="KEYW">
|
|
246
|
-
<span class='line'>239</span> </span><span class="NAME">
|
|
247
|
-
<span class='line'>240</span>
|
|
248
|
-
<span class='line'>241</span>
|
|
249
|
-
<span class='line'>242</span>
|
|
250
|
-
<span class='line'>243</span>
|
|
251
|
-
<span class='line'>244</span>
|
|
252
|
-
<span class='line'>245</span>
|
|
253
|
-
<span class='line'>246</span>
|
|
254
|
-
<span class='line'>247</span>
|
|
255
|
-
<span class='line'>248</span>
|
|
256
|
-
<span class='line'>249</span>
|
|
257
|
-
<span class='line'>250</span>
|
|
258
|
-
<span class='line'>251</span>
|
|
259
|
-
<span class='line'>252</span>
|
|
260
|
-
<span class='line'>253</span> </span><span class="KEYW">
|
|
261
|
-
<span class='line'>254</span>
|
|
262
|
-
<span class='line'>255</span>
|
|
263
|
-
<span class='line'>256</span>
|
|
264
|
-
<span class='line'>257</span>
|
|
265
|
-
<span class='line'>258</span>
|
|
266
|
-
<span class='line'>259</span>
|
|
267
|
-
<span class='line'>260</span>
|
|
268
|
-
<span class='line'>261</span>
|
|
269
|
-
<span class='line'>262</span>
|
|
270
|
-
<span class='line'>263</span>
|
|
271
|
-
<span class='line'>264</span>
|
|
272
|
-
<span class='line'>265</span>
|
|
273
|
-
<span class='line'>266</span>
|
|
274
|
-
<span class='line'>267</span> </span><span class="PUNC">
|
|
275
|
-
<span class='line'>268</span>
|
|
276
|
-
<span class='line'>269</span>
|
|
277
|
-
<span class='line'>270</span>
|
|
278
|
-
<span class='line'>271</span>
|
|
279
|
-
<span class='line'>272</span>
|
|
280
|
-
<span class='line'>273</span> </span><span class="PUNC">
|
|
281
|
-
<span class='line'>274</span>
|
|
282
|
-
<span class='line'>275</span>
|
|
283
|
-
<span class='line'>276</span>
|
|
284
|
-
<span class='line'>277</span>
|
|
285
|
-
<span class='line'>278</span>
|
|
286
|
-
<span class='line'>279</span> </span><span class="PUNC">
|
|
287
|
-
<span class='line'>280</span>
|
|
288
|
-
<span class='line'>281</span>
|
|
289
|
-
<span class='line'>282</span>
|
|
290
|
-
<span class='line'>283</span>
|
|
291
|
-
<span class='line'>284</span> </span><span class="PUNC">
|
|
292
|
-
<span class='line'>285</span>
|
|
293
|
-
<span class='line'>286</span>
|
|
294
|
-
<span class='line'>287</span> </span><span class="
|
|
295
|
-
<span class='line'>288</span>
|
|
296
|
-
<span class='line'>289</span>
|
|
297
|
-
<span class='line'>290</span> </span><span class="
|
|
298
|
-
<span class='line'>291</span>
|
|
299
|
-
<span class='line'>292</span> </span><span class="NAME">
|
|
300
|
-
<span class='line'>293</span> </span><span class="
|
|
301
|
-
<span class='line'>294</span>
|
|
302
|
-
<span class='line'>295</span>
|
|
303
|
-
<span class='line'>296</span>
|
|
304
|
-
<span class='line'>297</span>
|
|
305
|
-
<span class='line'>298</span>
|
|
245
|
+
<span class='line'>238</span> </span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">camelized</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">this.charAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">'-'</span><span class="WHIT"> </span><span class="PUNC">||</span><span class="WHIT"> </span><span class="NAME">this.charAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">'_'</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT">
|
|
246
|
+
<span class='line'>239</span> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NUMB">0</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">charAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toUpperCase</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NUMB">0</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">substring</span><span class="PUNC">(</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NUMB">0</span><span class="PUNC">]</span><span class="PUNC">;</span><span class="WHIT">
|
|
247
|
+
<span class='line'>240</span>
|
|
248
|
+
<span class='line'>241</span> </span><span class="KEYW">for</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="KEYW">var</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="WHIT"> </span><span class="PUNC"><</span><span class="WHIT"> </span><span class="NAME">len</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="NAME">i</span><span class="PUNC">++</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
249
|
+
<span class='line'>242</span> </span><span class="NAME">camelized</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">charAt</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">toUpperCase</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">parts</span><span class="PUNC">[</span><span class="NAME">i</span><span class="PUNC">]</span><span class="PUNC">.</span><span class="NAME">substring</span><span class="PUNC">(</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
250
|
+
<span class='line'>243</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
251
|
+
<span class='line'>244</span>
|
|
252
|
+
<span class='line'>245</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">camelized</span><span class="PUNC">;</span><span class="WHIT">
|
|
253
|
+
<span class='line'>246</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
254
|
+
<span class='line'>247</span>
|
|
255
|
+
<span class='line'>248</span> </span><span class="NAME">stripPx</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
256
|
+
<span class='line'>249</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">Number</span><span class="PUNC">(</span><span class="NAME">this.endsWith</span><span class="PUNC">(</span><span class="STRN">"px"</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">?</span><span class="WHIT"> </span><span class="NAME">this.match</span><span class="PUNC">(</span><span class="REGX">/(.*)px/</span><span class="PUNC">)</span><span class="PUNC">[</span><span class="NUMB">1</span><span class="PUNC">]</span><span class="WHIT"> </span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">this</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
257
|
+
<span class='line'>250</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
258
|
+
<span class='line'>251</span>
|
|
259
|
+
<span class='line'>252</span> </span><span class="NAME">classize</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
260
|
+
<span class='line'>253</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">this.length</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="STRN">""</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
261
|
+
<span class='line'>254</span> </span><span class="KEYW">if</span><span class="WHIT"> </span><span class="PUNC">(</span><span class="NAME">this.length</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT"> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.capitalize</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT"> </span><span class="PUNC">}</span><span class="WHIT">
|
|
262
|
+
<span class='line'>255</span>
|
|
263
|
+
<span class='line'>256</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.capitalize</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">slice</span><span class="PUNC">(</span><span class="NUMB">0</span><span class="PUNC">,</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="NAME">this.camelize</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">.</span><span class="NAME">slice</span><span class="PUNC">(</span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
264
|
+
<span class='line'>257</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
265
|
+
<span class='line'>258</span>
|
|
266
|
+
<span class='line'>259</span> </span><span class="NAME">isNumeric</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
267
|
+
<span class='line'>260</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">parseFloat</span><span class="PUNC">(</span><span class="KEYW">this</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">+</span><span class="WHIT"> </span><span class="STRN">''</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NAME">parseFloat</span><span class="PUNC">(</span><span class="KEYW">this</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
268
|
+
<span class='line'>261</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
269
|
+
<span class='line'>262</span>
|
|
270
|
+
<span class='line'>263</span> </span><span class="NAME">toBoolean</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
271
|
+
<span class='line'>264</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.toLowerCase</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">"true"</span><span class="PUNC">;</span><span class="WHIT">
|
|
272
|
+
<span class='line'>265</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
273
|
+
<span class='line'>266</span>
|
|
274
|
+
<span class='line'>267</span> </span><span class="NAME">validEmail</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
275
|
+
<span class='line'>268</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.match</span><span class="PUNC">(</span><span class="REGX">/^([^@\s]+)@((?:[\-a-z0-9]+\.)+[a-z]{2,})$/i</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
276
|
+
<span class='line'>269</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
277
|
+
<span class='line'>270</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
278
|
+
<span class='line'>271</span>
|
|
279
|
+
<span class='line'>272</span> </span><span class="NAME">Object.extend</span><span class="PUNC">(</span><span class="NAME">Number.prototype</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
280
|
+
<span class='line'>273</span> </span><span class="NAME">stripPx</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
281
|
+
<span class='line'>274</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="KEYW">this</span><span class="PUNC">;</span><span class="WHIT">
|
|
282
|
+
<span class='line'>275</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
283
|
+
<span class='line'>276</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
284
|
+
<span class='line'>277</span>
|
|
285
|
+
<span class='line'>278</span> </span><span class="NAME">Object.extend</span><span class="PUNC">(</span><span class="NAME">Array.prototype</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
286
|
+
<span class='line'>279</span> </span><span class="NAME">destroy</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">item</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
287
|
+
<span class='line'>280</span> </span><span class="NAME">this.splice</span><span class="PUNC">(</span><span class="NAME">this.indexOf</span><span class="PUNC">(</span><span class="NAME">item</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">1</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
288
|
+
<span class='line'>281</span> </span><span class="NAME">item.destroy</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
289
|
+
<span class='line'>282</span> </span><span class="PUNC">}</span><span class="PUNC">,</span><span class="WHIT">
|
|
290
|
+
<span class='line'>283</span>
|
|
291
|
+
<span class='line'>284</span> </span><span class="NAME">empty</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
292
|
+
<span class='line'>285</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">this.size</span><span class="PUNC">(</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">;</span><span class="WHIT">
|
|
293
|
+
<span class='line'>286</span> </span><span class="PUNC">}</span><span class="WHIT">
|
|
294
|
+
<span class='line'>287</span> </span><span class="PUNC">}</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
295
|
+
<span class='line'>288</span>
|
|
296
|
+
<span class='line'>289</span> </span><span class="COMM">// This is a superior implementation, developed by Douglas Crockford</span><span class="WHIT">
|
|
297
|
+
<span class='line'>290</span> </span><span class="COMM">// this function unfortunately treats the HTMLSelectElement as an array :(</span><span class="WHIT">
|
|
298
|
+
<span class='line'>291</span> </span><span class="NAME">Object.isArray</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="KEYW">function</span><span class="PUNC">(</span><span class="NAME">testObject</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">{</span><span class="WHIT">
|
|
299
|
+
<span class='line'>292</span> </span><span class="KEYW">return</span><span class="WHIT"> </span><span class="NAME">testObject</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="PUNC">!</span><span class="PUNC">(</span><span class="NAME">testObject.propertyIsEnumerable</span><span class="WHIT"> </span><span class="PUNC">!=</span><span class="WHIT"> </span><span class="NAME">undefined</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="NAME">testObject.propertyIsEnumerable</span><span class="PUNC">(</span><span class="STRN">'length'</span><span class="PUNC">)</span><span class="PUNC">)</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">testObject</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'object'</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="KEYW">typeof</span><span class="WHIT"> </span><span class="NAME">testObject.length</span><span class="WHIT"> </span><span class="PUNC">===</span><span class="WHIT"> </span><span class="STRN">'number'</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="PUNC">!</span><span class="PUNC">(</span><span class="NAME">testObject.tagName</span><span class="WHIT"> </span><span class="PUNC">==</span><span class="WHIT"> </span><span class="STRN">"SELECT"</span><span class="PUNC">)</span><span class="PUNC">;</span><span class="WHIT">
|
|
300
|
+
<span class='line'>293</span> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
|
|
301
|
+
<span class='line'>294</span>
|
|
302
|
+
<span class='line'>295</span> </span><span class="NAME">Prototype.Browser.IE6</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">Prototype.Browser.IE</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="NAME">parseInt</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.substring</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.indexOf</span><span class="PUNC">(</span><span class="STRN">"MSIE"</span><span class="PUNC">)</span><span class="PUNC">+</span><span class="NUMB">5</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">10</span><span class="PUNC">)</span><span class="PUNC">==</span><span class="NUMB">6</span><span class="PUNC">;</span><span class="WHIT">
|
|
303
|
+
<span class='line'>296</span> </span><span class="NAME">Prototype.Browser.IE7</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">Prototype.Browser.IE</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="NAME">parseInt</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.substring</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.indexOf</span><span class="PUNC">(</span><span class="STRN">"MSIE"</span><span class="PUNC">)</span><span class="PUNC">+</span><span class="NUMB">5</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">10</span><span class="PUNC">)</span><span class="PUNC">==</span><span class="NUMB">7</span><span class="PUNC">;</span><span class="WHIT">
|
|
304
|
+
<span class='line'>297</span> </span><span class="NAME">Prototype.Browser.IE8</span><span class="WHIT"> </span><span class="PUNC">=</span><span class="WHIT"> </span><span class="NAME">Prototype.Browser.IE</span><span class="WHIT"> </span><span class="PUNC">&&</span><span class="WHIT"> </span><span class="NAME">parseInt</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.substring</span><span class="PUNC">(</span><span class="NAME">navigator.userAgent.indexOf</span><span class="PUNC">(</span><span class="STRN">"MSIE"</span><span class="PUNC">)</span><span class="PUNC">+</span><span class="NUMB">5</span><span class="PUNC">)</span><span class="PUNC">,</span><span class="WHIT"> </span><span class="NUMB">10</span><span class="PUNC">)</span><span class="PUNC">==</span><span class="NUMB">8</span><span class="PUNC">;</span><span class="WHIT">
|
|
305
|
+
<span class='line'>298</span>
|
|
306
|
+
<span class='line'>299</span>
|
|
307
|
+
<span class='line'>300</span>
|
|
308
|
+
<span class='line'>301</span> </span></pre></body></html>
|
|
@@ -569,6 +569,7 @@ rio.Model = {
|
|
|
569
569
|
});
|
|
570
570
|
},
|
|
571
571
|
|
|
572
|
+
_belongsToAssociations: {},
|
|
572
573
|
belongsTo: function(args) {
|
|
573
574
|
var options = {};
|
|
574
575
|
var associationName;
|
|
@@ -578,24 +579,27 @@ rio.Model = {
|
|
|
578
579
|
} else {
|
|
579
580
|
associationName = args;
|
|
580
581
|
}
|
|
582
|
+
options.className = options.className || associationName.classize();
|
|
583
|
+
options.foreignKey = options.foreignKey || associationName + "Id";
|
|
584
|
+
|
|
585
|
+
this._belongsToAssociations[associationName] = options;
|
|
586
|
+
|
|
581
587
|
this.attrAccessor(associationName);
|
|
582
588
|
this.clientOnlyAttr(associationName);
|
|
583
589
|
|
|
584
|
-
var className = options.className || associationName.classize();
|
|
585
|
-
var foreignKey = options.foreignKey || associationName + "Id";
|
|
586
590
|
var getName = ("get-" + associationName).camelize();
|
|
587
591
|
|
|
588
592
|
this.prototype[getName] = this.prototype[getName].wrap(function(proceed) {
|
|
589
593
|
if (this["_" + associationName] == undefined) {
|
|
590
594
|
var setAssociation = function() {
|
|
591
|
-
var associationId = this["_" + foreignKey];
|
|
592
|
-
var foundValue = rio.models[className].find(associationId, {
|
|
595
|
+
var associationId = this["_" + options.foreignKey];
|
|
596
|
+
var foundValue = rio.models[options.className].find(associationId, {
|
|
593
597
|
asynchronous: false
|
|
594
598
|
});
|
|
595
599
|
this[("set-" + associationName).camelize()](foundValue);
|
|
596
600
|
}.bind(this);
|
|
597
601
|
setAssociation();
|
|
598
|
-
this[foreignKey].bind(setAssociation, true);
|
|
602
|
+
this[options.foreignKey].bind(setAssociation, true);
|
|
599
603
|
}
|
|
600
604
|
return proceed.apply(this, $A(arguments).slice(1));
|
|
601
605
|
});
|
|
@@ -1017,6 +1021,15 @@ rio.Model = {
|
|
|
1017
1021
|
this.setId(options.id);
|
|
1018
1022
|
}
|
|
1019
1023
|
|
|
1024
|
+
// Set assiated id's from belongsTo associations
|
|
1025
|
+
Object.keys(model._belongsToAssociations).each(function(belongsToName) {
|
|
1026
|
+
var associationValue = options[belongsToName];
|
|
1027
|
+
if (associationValue) {
|
|
1028
|
+
var belongsToOptions = model._belongsToAssociations[belongsToName];
|
|
1029
|
+
this["_" + belongsToOptions.foreignKey] = associationValue.getId();
|
|
1030
|
+
}
|
|
1031
|
+
}.bind(this));
|
|
1032
|
+
|
|
1020
1033
|
(this.__initialize.bind(this))(options);
|
|
1021
1034
|
|
|
1022
1035
|
// Add the hasManyAssocitation#create methods
|
|
@@ -48,21 +48,21 @@ rio.Page = {
|
|
|
48
48
|
},
|
|
49
49
|
|
|
50
50
|
popup: function() {
|
|
51
|
-
if (!this.
|
|
52
|
-
this.
|
|
51
|
+
if (!this.__popup) {
|
|
52
|
+
this.__popup = new rio.components.Popup({
|
|
53
53
|
content: this.html()
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
-
this.
|
|
56
|
+
this.__popup.activate();
|
|
57
57
|
this.render();
|
|
58
58
|
},
|
|
59
59
|
|
|
60
60
|
resizePopup: function() {
|
|
61
|
-
this.
|
|
61
|
+
this.__popup.resize();
|
|
62
62
|
},
|
|
63
63
|
|
|
64
64
|
closePopup: function(skipFade) {
|
|
65
|
-
this.
|
|
65
|
+
this.__popup.deactivate(skipFade);
|
|
66
66
|
},
|
|
67
67
|
|
|
68
68
|
isManagingLayout: function() {
|
|
@@ -163,29 +163,32 @@ if (rio.environment.logEventErrors) {
|
|
|
163
163
|
|
|
164
164
|
Object.extend(Date.prototype, {
|
|
165
165
|
strftime: function(format) {
|
|
166
|
-
var day = this.
|
|
167
|
-
var hours = this.
|
|
166
|
+
var day = this.getDay(), month = this.getMonth();
|
|
167
|
+
var hours = this.getHours(), minutes = this.getMinutes();
|
|
168
168
|
function pad(num) { return num.toPaddedString(2); }
|
|
169
169
|
|
|
170
|
-
return format.gsub(/\%([
|
|
170
|
+
return format.gsub(/\%([aAbBcdDeHiImMnpPSwyY])/, function(part) {
|
|
171
171
|
switch(part[1]) {
|
|
172
172
|
case 'a': return $w("Sun Mon Tue Wed Thu Fri Sat")[day];
|
|
173
173
|
case 'A': return $w("Sunday Monday Tuesday Wednesday Thursday Friday Saturday")[day];
|
|
174
174
|
case 'b': return $w("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec")[month];
|
|
175
175
|
case 'B': return $w("January February March April May June July August September October November December")[month];
|
|
176
176
|
case 'c': return this.toString();
|
|
177
|
-
case 'd': return pad(this.
|
|
178
|
-
case 'D': return pad(this.
|
|
177
|
+
case 'd': return pad(this.getDate());
|
|
178
|
+
case 'D': return pad(this.getDate());
|
|
179
|
+
case 'e': return this.getDate();
|
|
179
180
|
case 'H': return pad(hours);
|
|
180
181
|
case 'i': return (hours === 12 || hours === 0) ? 12 : (hours + 12) % 12;
|
|
181
182
|
case 'I': return pad((hours === 12 || hours === 0) ? 12 : (hours + 12) % 12);
|
|
182
183
|
case 'm': return pad(month + 1);
|
|
183
184
|
case 'M': return pad(minutes);
|
|
185
|
+
case 'n': return month + 1;
|
|
184
186
|
case 'p': return hours > 11 ? 'PM' : 'AM';
|
|
185
|
-
case '
|
|
187
|
+
case 'P': return hours > 11 ? 'pm' : 'am';
|
|
188
|
+
case 'S': return pad(this.getSeconds());
|
|
186
189
|
case 'w': return day;
|
|
187
|
-
case 'y': return pad(this.
|
|
188
|
-
case 'Y': return this.
|
|
190
|
+
case 'y': return pad(this.getFullYear() % 100);
|
|
191
|
+
case 'Y': return this.getFullYear().toString();
|
|
189
192
|
}
|
|
190
193
|
}.bind(this));
|
|
191
194
|
},
|
|
@@ -220,7 +223,7 @@ Object.extend(Date, {
|
|
|
220
223
|
}
|
|
221
224
|
|
|
222
225
|
// I had to add the * 2 to get it to work
|
|
223
|
-
offset -= date.getTimezoneOffset()
|
|
226
|
+
offset -= date.getTimezoneOffset();
|
|
224
227
|
time = (Number(date) + (offset * 60 * 1000));
|
|
225
228
|
|
|
226
229
|
return new Date(Number(time));
|
|
@@ -1883,6 +1883,19 @@ describe(rio.Model, {
|
|
|
1883
1883
|
|
|
1884
1884
|
this.modelInstance.setUserId(22);
|
|
1885
1885
|
},
|
|
1886
|
+
|
|
1887
|
+
"by initializing it's foreign key with the assiation id": function() {
|
|
1888
|
+
var user = new rio.models.User({ id: 14 });
|
|
1889
|
+
|
|
1890
|
+
new this.model({ user: user }).getUserId().shouldEqual(14);
|
|
1891
|
+
},
|
|
1892
|
+
|
|
1893
|
+
"by initializing it's custom foreign key with the assiation id": function() {
|
|
1894
|
+
var user = new rio.models.User({ id: 254 });
|
|
1895
|
+
var company = new this.companyModel({ id: 254 });
|
|
1896
|
+
|
|
1897
|
+
new this.model({ company: company }).getEmployerId().shouldEqual(254);
|
|
1898
|
+
},
|
|
1886
1899
|
|
|
1887
1900
|
"by allowing explicitly defined class names": function() {
|
|
1888
1901
|
var user91 = new rio.models.User({ id: 91 });
|