Skip to content

Commit

Permalink
Keep it up-to-date
Browse files Browse the repository at this point in the history
  • Loading branch information
@towerhe
towerhe committed Mar 12, 2014
1 parent 591bafc commit d8125c3
Show file tree
Hide file tree
Showing 193 changed files with 1,884 additions and 1,466 deletions.
182 changes: 83 additions & 99 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,166 +8,150 @@ GIT
GEM
remote: http://ruby.taobao.org/
specs:
activesupport (3.2.13)
i18n (= 0.6.1)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
builder (3.1.3)
capybara (2.0.2)
builder (3.2.2)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.8)
xpath (~> 2.0)
chunky_png (1.3.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.3.3)
compass (0.12.2)
coffee-script-source (1.7.0)
compass (0.12.3)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
daemons (1.1.8)
diff-lcs (1.2.1)
eventmachine (0.12.10)
sass (= 3.2.14)
daemons (1.1.9)
diff-lcs (1.2.4)
eventmachine (1.0.3)
eventmachine (1.0.3-x86-mingw32)
execjs (1.4.0)
multi_json (~> 1.0)
faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
ffi (1.4.0)
ffi (1.9.3)
ffi (1.9.3-x86-mingw32)
fssm (0.2.10)
haml (4.0.3)
haml (4.0.5)
tilt
highline (1.6.13)
highline (1.6.19)
hike (1.2.3)
http_parser.rb (0.5.3)
http_router (0.10.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.6.1)
listen (0.7.3)
http_parser.rb (0.5.3-x86-mingw32)
i18n (0.6.9)
json (1.8.1)
kramdown (1.3.2)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
maruku (0.6.1)
syntax (>= 1.0.0)
method_source (0.8.2)
middleman (3.0.14)
middleman-core (= 3.0.14)
middleman-more (= 3.0.14)
middleman-sprockets (~> 3.1.0)
middleman-blog (3.1.1)
maruku (~> 0.6.0)
middleman-core (~> 3.0.1)
tzinfo (~> 0.3.0)
middleman-core (3.0.14)
activesupport (~> 3.2.6)
bundler (~> 1.1)
listen (~> 0.7.3)
rack (~> 1.4.1)
rack-test (~> 0.6.1)
rb-fsevent (~> 0.9.3)
thor (~> 0.15.4)
tilt (~> 1.3.6)
middleman-more (3.0.14)
method_source (0.8.1)
middleman (3.2.2)
coffee-script (~> 2.2.0)
coffee-script-source (~> 1.3.3)
compass (>= 0.12.2)
execjs (~> 1.4.0)
haml (>= 3.1.6)
i18n (~> 0.6.0, < 0.6.2)
maruku (~> 0.6.0)
middleman-core (= 3.0.14)
padrino-helpers (= 0.10.7)
kramdown (~> 1.2)
middleman-core (= 3.2.2)
middleman-sprockets (>= 3.1.2)
sass (>= 3.1.20)
uglifier (~> 1.2.6)
middleman-sprockets (3.1.2)
middleman-core (>= 3.0.14)
middleman-more (>= 3.0.14)
uglifier (~> 2.4.0)
middleman-blog (3.2.0)
maruku (~> 0.6.0)
middleman-core (~> 3.0)
tzinfo (~> 0.3.0)
middleman-core (3.2.2)
activesupport (~> 3.2.6)
bundler (~> 1.1)
i18n (~> 0.6.9)
listen (~> 1.1)
rack (>= 1.4.5)
rack-test (~> 0.6.1)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1)
middleman-sprockets (3.3.1)
middleman-core (>= 3.2)
sprockets (~> 2.1)
sprockets-helpers (~> 1.0.0)
sprockets-sass (~> 1.0.0)
mime-types (1.21)
multi_json (1.7.7)
nokogiri (1.5.6)
padrino-core (0.10.7)
activesupport (~> 3.2.0)
http_router (~> 0.10.2)
sinatra (~> 1.3.1)
thor (~> 0.15.2)
tilt (~> 1.3.0)
padrino-helpers (0.10.7)
i18n (~> 0.6)
padrino-core (= 0.10.7)
poltergeist (1.1.0)
capybara (~> 2.0, >= 2.0.1)
faye-websocket (~> 0.4, >= 0.4.4)
mime-types (1.23)
multi_json (1.9.0)
nokogiri (1.5.9)
nokogiri (1.5.9-x86-mingw32)
poltergeist (1.3.0)
capybara (~> 2.1.0)
faye-websocket (>= 0.4.4, < 0.5.0)
http_parser.rb (~> 0.5.3)
pry (0.9.6)
coderay (>= 0.9.8)
method_source (>= 0.6.5)
ruby_parser (>= 2.0.5)
slop (~> 2.1.0)
rack (1.4.5)
rack-protection (1.5.0)
rack
pry (0.9.6-x86-mingw32)
coderay (>= 0.9.8)
method_source (>= 0.6.5)
ruby_parser (>= 2.0.5)
slop (~> 2.1.0)
win32console (>= 1.3.0)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.0.0)
rb-fsevent (0.9.3)
redcarpet (2.1.1)
rake (10.0.4)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
rb-kqueue (0.2.2)
ffi (>= 0.5.0)
redcarpet (2.3.0)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.0)
ruby_parser (3.2.2)
rspec-mocks (2.13.1)
ruby_parser (3.2.1)
sexp_processor (~> 4.1)
rubyzip (0.9.9)
sass (3.2.9)
selenium-webdriver (2.31.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
sexp_processor (4.3.0)
sinatra (1.3.6)
rack (~> 1.4)
rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
sass (3.2.14)
sexp_processor (4.2.1)
slop (2.1.0)
sprockets (2.10.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.0.1)
sprockets (~> 2.0)
sprockets-sass (1.0.1)
sprockets-sass (1.0.3)
sprockets (~> 2.0)
tilt (~> 1.1)
syntax (1.0.0)
thin (1.4.1)
syntax (1.2.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.15.4)
tilt (1.3.7)
tzinfo (0.3.35)
uglifier (1.2.7)
thor (0.18.1)
tilt (1.4.1)
tzinfo (0.3.37)
uglifier (2.4.0)
execjs (>= 0.3.0)
multi_json (~> 1.3)
url_mount (0.2.1)
rack
websocket (1.0.7)
xpath (1.0.0)
json (>= 1.8.0)
win32console (1.3.2-x86-mingw32)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
activesupport
Expand Down
Binary file modified images/Rails and Ember MVC.sketch/QuickLook/Preview.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Rails and Ember MVC.sketch/QuickLook/Thumbnail.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 33 additions & 20 deletions source/about.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,24 @@
title: "A framework for creating ambitious web applications"
---

<% content_for :head do %>
<script type="text/javascript" src="/javascripts/about.js"></script>
<% content_for :foot do %>
<script type="text/javascript">
$(function() {
$('#slider').bxSlider({
displaySlideQty: 4,
moveSlideQty: 4,
auto: true,
pager: true,
speed: 700,
pause: 5000
});

// Hack to force proper sizing
$('.bx-wrapper, .bx-window').css('width', 940);
});
</script>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
<script type="text/javascript" src="/javascripts/app/about/inline-examples.js" defer></script>
<% end %>

<h1 class="about-header-text">
Expand All @@ -12,15 +28,15 @@ title: "A framework for creating ambitious web applications"

<div id="download">
<div id="download-ember">
<a class="orange button" href="https://github.com/emberjs/starter-kit/archive/v1.3.0.zip">
<a class="orange button" href="https://github.com/emberjs/starter-kit/archive/v1.4.0.zip">
Download the Starter Kit
</a>
<div class="info">
1.3.0:
<a class="debug" href="http://builds.emberjs.com/tags/v1.3.0/ember.prod.js">production</a>
<a class="debug" href="http://builds.emberjs.com/tags/v1.3.0/ember.min.js">(min + gzip 69kb)</a> |
<a class="debug" href="http://builds.emberjs.com/tags/v1.3.0/ember.js">debug</a> |
<a href="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.2.1.js">Handlebars</a> |
1.4.0:
<a class="debug" href="http://builds.emberjs.com/tags/v1.4.0/ember.prod.js">production</a>
<a class="debug" href="http://builds.emberjs.com/tags/v1.4.0/ember.min.js">(min + gzip 71kb)</a> |
<a class="debug" href="http://builds.emberjs.com/tags/v1.4.0/ember.js">debug</a> |
<a href="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js">Handlebars</a> |
<a class="debug" href="/guides/getting-ember">packages</a>
</div>
</div>
Expand All @@ -33,7 +49,7 @@ title: "A framework for creating ambitious web applications"
<li class="gplus">
<a href="https://plus.google.com/101668252557697758617" rel="publisher">
Follow on
<img src="//ssl.gstatic.com/images/icons/gplus-32.png" alt="Google+" style="border:0;width:20px;height:20px;"/>
<img src="//ssl.gstatic.com/images/icons/gplus-32.png" alt="Google+" width="20" height="20" />
</a>
</li>
</ul>
Expand Down Expand Up @@ -108,7 +124,7 @@ title: "A framework for creating ambitious web applications"
<% data.users.slice(0,12).each do |user| %>
<li class="user">
<a href="<%= user.url %>" rel="nofollow">
<img src="/images/about/<%= user.image %>">
<img src="/images/about/<%= user.image %>" width="210" height="103" />
</a>
</li>
<% end %>
Expand All @@ -126,25 +142,25 @@ title: "A framework for creating ambitious web applications"
<h2>Buy Ember.js Gear and Support Development</h2>
<div class="gear">
<a href="http://devswag.com/products/ember-sticker">
<img src="/images/about/ember-sticker.png">
<img src="/images/about/ember-sticker.png" width="160" height="120">
</a>
<div class="gearplus">
<img src="/images/about/plus-icon.png">
<img src="/images/about/plus-icon.png" width="20" height="21">
</div>
<a href="http://devswag.com/products/ember-js-tshirt">
<img src="/images/about/ember-shirt.png">
<img src="/images/about/ember-shirt.png" width="160" height="120">
</a>
<div class="gearplus">
<img src="/images/about/plus-icon.png">
<img src="/images/about/plus-icon.png" width="20" height="21">
</div>
<a href="http://devswag.com/products/ember-mascot-stickers-4">
<img src="/images/about/ember-hamster-sticker.png">
<img src="/images/about/ember-hamster-sticker.png" width="160" height="120">
</a>
<div class="gearplus">
<img src="/images/about/plus-icon.png">
<img src="/images/about/plus-icon.png" width="20" height="21">
</div>
<a href="http://devswag.com/products/ember-mascot-tomster">
<img src="/images/about/ember-tomster-plush-2.png">
<img src="/images/about/ember-tomster-plush-2.png" width="160" height="120">
</a>
</div>
</div>
Expand All @@ -156,6 +172,3 @@ title: "A framework for creating ambitious web applications"
</a>
</div>
</div>

<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>

4 changes: 3 additions & 1 deletion source/api/module.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<h1 class="api-header"><%= @module['name'] %> Module</h1>

<hr>

<% if @module['module'] %>
<p>Parent: <%= link_to @module['module'], "#{@module['module']}.html" %></p>
<% end %>

<% if @module['requires'] %>
<p>Requires: <%= @module['requires'].map{|r| link_to(r['name'], "#{r['name']}.html") }.join(", ") %></p>
<p>Requires: <%= @module['requires'].map{|r| link_to(r, "#{r}.html") }.join(", ") %></p>
<% end %>

<p><%= api_markdown @module['description'] %></p>
Expand Down
4 changes: 2 additions & 2 deletions source/bilingual_guides/configuring-ember/disabling-prototype-extensions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ fullName: function() {

// Instead, do this:
//你需要这样做：
fullName: Ember.computed(function() {
fullName: Ember.computed('firstName', 'lastName', function() {
return this.get('firstName') + ' ' + this.get('lastName');
}).property('firstName', 'lastName')
})
```

Observers are annotated using `Ember.observer()`:
Expand Down
Loading

0 comments on commit d8125c3

Please sign in to comment.