somewhat more consistent naming

This commit is contained in:
Sven Fuchs 2012-10-12 02:34:54 +02:00
parent ba685b1593
commit f16c83d10f
8 changed files with 33 additions and 28 deletions

View File

@ -43,7 +43,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-api.git
revision: 02f5eea4fcbea7be5331b86bb60ed84ce2872ceb
revision: 272c1275f49cd33668dd5c4a324d49491dd29496
specs:
travis-api (0.0.1)
backports (~> 2.5)
@ -61,7 +61,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
revision: 1448d4b1505b38014d3083f45500d371c8ec999f
revision: 3154d3fbfa6fe4202ade27f5712927b72dc1673b
branch: sf-travis-api
specs:
travis-core (0.0.1)

View File

@ -1 +1 @@
Travis.HomeController = Travis.Controller.extend()
Travis.HomeLayoutController = Travis.Controller.extend()

View File

@ -254,13 +254,13 @@ Travis.Router = Ember.Router.extend
home: Ember.Route.extend
route: '/'
connectOutlets: (router) ->
router.get('applicationController').connectOutlet 'home'
router.get('applicationController').connectOutlet 'homeLayout'
$('body').attr('id', 'home')
router.get('homeController').connectOutlet 'left', 'repos'
router.get('homeController').connectOutlet 'right', 'sidebar'
router.get('homeController').connectOutlet 'top', 'top'
router.get('homeController').connectOutlet 'main', 'repo'
router.get('homeController').connectOutlet 'flash', 'flash'
router.get('homeLayoutController').connectOutlet 'left', 'repos'
router.get('homeLayoutController').connectOutlet 'right', 'sidebar'
router.get('homeLayoutController').connectOutlet 'top', 'top'
router.get('homeLayoutController').connectOutlet 'main', 'repo'
router.get('homeLayoutController').connectOutlet 'flash', 'flash'
show: Ember.Route.extend
route: '/'

View File

@ -12,27 +12,13 @@ require 'ext/ember/namespace'
@Travis.reopen
HomeView: Travis.View.extend(templateName: 'layouts/home')
HomeLayoutView: Travis.View.extend(templateName: 'layouts/home')
AuthLayoutView: Travis.View.extend(templateName: 'layouts/simple')
ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile')
StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple')
ApplicationView: Travis.View.extend
templateName: 'application'
localeDidChange: (->
if locale = Travis.app.get('auth.user.locale')
Travis.setLocale(locale)
Travis.app.get('router').reload()
).observes('Travis.app.auth.user.locale')
click: (event) ->
# TODO: this solves the case of closing menus and popups,
# but I would like to rewrite it later, not sure how
# yet, but this does not seem optimal
if ! $(event.target).parents().andSelf().hasClass('popup')
@popupCloseAll()
if ! $(event.target).parents().andSelf().hasClass('menu')
$('.menu').removeClass('display')
require 'views/accounts'
require 'views/application'
require 'views/build'
require 'views/flash'
require 'views/job'

View File

@ -0,0 +1,19 @@
@Travis.reopen
ApplicationView: Travis.View.extend
templateName: 'application'
localeDidChange: (->
if locale = Travis.app.get('auth.user.locale')
Travis.setLocale(locale)
Travis.app.get('router').reload()
).observes('Travis.app.auth.user.locale')
click: (event) ->
# TODO: this solves the case of closing menus and popups,
# but I would like to rewrite it later, not sure how
# yet, but this does not seem optimal
if ! $(event.target).parents().andSelf().hasClass('popup')
@popupCloseAll()
if ! $(event.target).parents().andSelf().hasClass('menu')
$('.menu').removeClass('display')

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
b9f79cf9
3e9dccd4