Merge branch 'cj-dev-mode-status'

This commit is contained in:
probablycorey
2013-09-26 14:32:58 -07:00
4 changed files with 21 additions and 4 deletions

View File

@@ -9,10 +9,9 @@ _ = require 'underscore'
module.exports =
class ApplicationMenu
version: null
devMode: null
menu: null
constructor: (@version, @devMode) ->
constructor: (@version) ->
@menu = Menu.buildFromTemplate @getDefaultTemplate()
Menu.setApplicationMenu @menu
@@ -149,7 +148,6 @@ class ApplicationMenu
submenu: [ { label: 'In Development Mode', enabled: false } ]
template = [atomMenu, fileMenu, editMenu, viewMenu, windowMenu]
template.push devMenu if @devMode
@translateTemplate template, keystrokesByCommand

View File

@@ -57,7 +57,7 @@ class AtomApplication
@pathsToOpen ?= []
@windows = []
@applicationMenu = new ApplicationMenu(@version, devMode)
@applicationMenu = new ApplicationMenu(@version)
@atomProtocolHandler = new AtomProtocolHandler(@resourcePath)
@listenForArgumentsFromNewProcess()

View File

@@ -65,6 +65,8 @@ class RootView extends View
# Private:
initialize: (state={}) ->
@prepend($$ -> @div class: 'dev-mode') if atom.getLoadSettings().devMode
if state instanceof telepath.Document
@state = state
panes = deserialize(state.get('panes'))

View File

@@ -37,6 +37,23 @@ h6 {
-webkit-flex: 1;
-webkit-flex-flow: column;
}
.dev-mode {
&:before {
content: ""; // This is not a space, it is a skull and crossbones
}
padding: @component-icon-padding;
position: absolute;
top: 0;
right: 0;
font-family: Wingdings;
font-size: 25px;
z-index: 1000;
opacity: 0.75;
color: @text-color-highlight;
}
}
#panes {