Merge pull request #381 from yhat/unicode

show unicode
yhat · Jul 14, 2016 · f4c6202 · f4c6202
2 parents 5e8e97f + 627f4e2
commit f4c6202
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/browser/jsx/containers/editor-tab-group/editor-tab-group.jsx b/src/browser/jsx/containers/editor-tab-group/editor-tab-group.jsx
@@ -141,6 +141,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(React.createClass({
   render: function () {
     const props = this.props,
       items = props.items,
+      runLineTitle = process.platform === 'darwin' ? '⌘ + Enter' : 'Alt + Enter',
+      runScriptTitle = process.platform === 'darwin' ? '⌘ + Shift + Enter' : 'Alt + Shift + Enter',
       types = {
         'ace-pane': item => (
           <AcePane
@@ -168,13 +170,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(React.createClass({
       >
         <li><a className="icon-overflowing not-tab" onClick={props.onRodeo}><span /></a></li>
         <li className="right">
-          <a className="not-tab" onClick={props.onRunActiveAcePane} title="Run Script">
+          <a className="not-tab" onClick={props.onRunActiveAcePane} title={runScriptTitle}>
             <span className="fa fa-play-circle" />
             <span className="icon-text-right">{'Run Script'}</span>
           </a>
         </li>
         <li className="right">
-          <a className="not-tab" onClick={props.onRunActiveAcePaneSelection} title="Run Line">
+          <a className="not-tab" onClick={props.onRunActiveAcePaneSelection} title={runLineTitle}>
             <span className="fa fa-play" />
             <span className="icon-text-right">{'Run Line'}</span>
           </a>

diff --git a/src/browser/jsx/entry/free-tabs-only.html b/src/browser/jsx/entry/free-tabs-only.html
@@ -3,6 +3,8 @@
 <html lang="en">
 <head>
   <title>Rodeo</title>
+  <meta charset="utf-8"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link id="rodeo-theme" href="themes/default.css" rel="stylesheet"/>
   <script type="text/javascript">delete module;</script>
 </head>

diff --git a/src/browser/jsx/entry/main.html b/src/browser/jsx/entry/main.html
@@ -3,6 +3,8 @@
 <html lang="en">
 <head>
   <title>Rodeo</title>
+  <meta charset="utf-8"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link id="rodeo-theme" href="themes/default.css" rel="stylesheet"/>
   <script type="text/javascript">delete module;</script>
 </head>

diff --git a/src/browser/jsx/entry/startup.html b/src/browser/jsx/entry/startup.html
@@ -2,8 +2,9 @@
 <!--suppress HtmlUnknownTarget -->
 <html>
 <head>
-  <meta charset="utf-8"/>
   <title>Rodeo Startup</title>
+  <meta charset="utf-8"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link id="rodeo-theme" href="themes/default.css" rel="stylesheet"/>
   <script type="text/javascript">delete module;</script>
 </head>