diff options
| author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
| commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
| tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/require/browser.js | |
| parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
| parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
| download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/require/browser.js')
| -rwxr-xr-x | node_modules/montage/require/browser.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js index f4a11d97..a6a8af5a 100755 --- a/node_modules/montage/require/browser.js +++ b/node_modules/montage/require/browser.js | |||
| @@ -82,7 +82,7 @@ if (global.navigator && global.navigator.userAgent.indexOf("Firefox") >= 0) { | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | var __FILE__String = "__FILE__", | 84 | var __FILE__String = "__FILE__", |
| 85 | DoubleUnderscoreString = "__" | 85 | DoubleUnderscoreString = "__", |
| 86 | globalEvalConstantA = "(function ", | 86 | globalEvalConstantA = "(function ", |
| 87 | globalEvalConstantB = "(require, exports, module) {", | 87 | globalEvalConstantB = "(require, exports, module) {", |
| 88 | globalEvalConstantC = "//*/\n})\n//@ sourceURL="; | 88 | globalEvalConstantC = "//*/\n})\n//@ sourceURL="; |