mirror of
https://github.com/atom/atom.git
synced 2026-01-23 05:48:10 -05:00
Merge branch 'cj-dev-mode-status'
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ class AtomApplication
|
||||
@pathsToOpen ?= []
|
||||
@windows = []
|
||||
|
||||
@applicationMenu = new ApplicationMenu(@version, devMode)
|
||||
@applicationMenu = new ApplicationMenu(@version)
|
||||
@atomProtocolHandler = new AtomProtocolHandler(@resourcePath)
|
||||
|
||||
@listenForArgumentsFromNewProcess()
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user