Merge branch 'master' of github.com:travis-ci/travis-ember

Gemfile.lock

@@ -35,7 +35,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-api.git
-  revision: e8d2604ec3e466856f64f20c42b03829d7cff996
+  revision: f05f841a46dbd9601e57676f8c4a356b21234cf2
   specs:
     travis-api (0.0.1)
       backports (~> 2.5)
@@ -223,7 +223,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thin (1.4.1)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)

assets/javascripts/app/app.coffee

@@ -5,6 +5,7 @@ require 'helpers'
 require 'models'
 require 'pusher'
 require 'routes'
+require 'slider'
 require 'store'
 require 'tailing'
 require 'templates'
@@ -33,6 +34,7 @@ Travis.reopen
 
       @set('auth', Travis.Auth.create(store: @store, endpoint: Travis.config.api_endpoint))
 
+      @slider = new Travis.Slider()
       @routes = new Travis.Routes()
       @pusher = new Travis.Pusher()
       @tailing = new Travis.Tailing()

assets/javascripts/app/controllers/sidebar.coffee

@@ -4,28 +4,12 @@ Travis.reopen
       @tickables = []
       Travis.Ticker.create(target: this, interval: Travis.INTERVALS.sponsors)
 
-      @toggle() if localStorage?.getItem('travis.maximized')
-
       @connectWorkers(Travis.Worker.find())
       @connectQueues(Travis.QUEUES)
 
       @connectSponsors('decks', Travis.Sponsor.decks(), 1)
       @connectSponsors('links', Travis.Sponsor.links(), 6)
 
-    persist: ->
-      localStorage?.setItem('travis.maximized', @isMinimized())
-
-    isMinimized: ->
-      return $('body').hasClass('maximized');
-
-    toggle: ->
-      $('body').toggleClass('maximized')
-      @persist()
-      # TODO gotta force redraws here :/
-      element = $('<span></span>')
-      $('#top .profile').append(element)
-      Em.run.later (-> element.remove()), 10
-
     connectSponsors: (name, sponsors, perPage) ->
       controller = Travis.SponsorsController.create(perPage: perPage, content: sponsors)
       viewClass = Em.View.extend(templateName: "sponsors/#{name}")

assets/javascripts/app/slider.coffee

@@ -0,0 +1,24 @@
+@Travis.Slider = ->
+  @minimize() if localStorage?.getItem('travis.maximized') == 'true'
+  this
+
+$.extend Travis.Slider.prototype,
+  persist: ->
+    localStorage?.setItem('travis.maximized', @isMinimized())
+
+  isMinimized: ->
+    return $('body').hasClass('maximized');
+
+  minimize: ->
+    $('body').addClass('maximized')
+
+  toggle: ->
+    $('body').toggleClass('maximized')
+    @persist()
+    # TODO gotta force redraws here :/
+    element = $('<span></span>')
+    $('#top .profile').append(element)
+    Em.run.later (-> element.remove()), 10
+
+
+

assets/javascripts/app/templates/layouts/profile.hbs

@@ -11,7 +11,7 @@
 </div>
 
 <div id="right">
-  <div id="slider" {{action toggleSidebar target="Travis.app"}}>
+  <div id="slider" {{action toggle target="Travis.app.slider"}}>
     <div class='icon'></div>&nbsp;
   </div>
 

assets/javascripts/app/templates/layouts/sidebar.hbs

@@ -2,7 +2,7 @@
   {{t layouts.application.fork_me}}
 </a>
 
-<div id="slider" {{action toggle target="controller"}}>
+<div id="slider" {{action toggle target="Travis.app.slider"}}>
   <div class='icon'></div>&nbsp;
 </div>