diff --git a/src/js/graph/index.js b/src/js/graph/index.js index 88774f2a..5d11d185 100644 --- a/src/js/graph/index.js +++ b/src/js/graph/index.js @@ -1,11 +1,5 @@ var _ = require('underscore'); -var Git = require('../git'); -var Commit = Git.Commit; -var Branch = Git.Branch; -var Tag = Git.Tag; -var Ref = Git.Ref; - function invariant(truthy, reason) { if (!truthy) { throw new Error(reason); @@ -88,6 +82,7 @@ var Graph = { parentObjs.push(this.getOrMakeRecursive(tree, createdSoFar, parentID)); }, this); + var Commit = require('../git').Commit; var commit = new Commit(_.extend( commitJSON, { diff --git a/src/js/intl/checkStrings.js b/src/js/intl/checkStrings.js index aa1ad087..4ecf3c66 100644 --- a/src/js/intl/checkStrings.js +++ b/src/js/intl/checkStrings.js @@ -1,4 +1,5 @@ var sys = require('sys'); +var util = require('../util'); var _ = require('underscore'); var child_process = require('child_process'); var strings = require('../intl/strings').strings; @@ -39,9 +40,11 @@ var processLines = function(lines) { }); }; -child_process.exec( - searchCommand, - function(err, output) { - processLines(output.split('\n')); -}); +if (!util.isBrowser()) { + child_process.exec( + searchCommand, + function(err, output) { + processLines(output.split('\n')); + }); +} diff --git a/src/style/main.css b/src/style/main.css index 70d520e3..e9c76bf4 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -211,7 +211,6 @@ body.hgMode #mainVisSpace .modeText.hgMode { /* Some interface things */ div.canvasTerminalHolder { - width: 100%; height: 100%; position: fixed; top: 0; @@ -300,6 +299,7 @@ div.canvasTerminalHolder > div.terminal-window-holder div.inside { div.canvasTerminalHolder > div.terminal-window-holder { max-width: 500px; + min-width: 500px; } /* Toolbar */ diff --git a/src/template.index.html b/src/template.index.html index ad17e01e..4f1c4e09 100644 --- a/src/template.index.html +++ b/src/template.index.html @@ -184,8 +184,6 @@ -