diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-07 05:37:16 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-07 05:37:16 -0400 |
| commit | 67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce (patch) | |
| tree | 4fe5381c2b2a16f994a8bfa6092db70e77e7a52f /askbot/media/js/wmd | |
| parent | b03f881b11204b7e0fe323dd9148085ef0dfa35d (diff) | |
| parent | 60bc578f579d8b5a40e4c040a0bbd6a60e30e950 (diff) | |
| download | askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.gz askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.bz2 askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.zip | |
merged with the master branch
Diffstat (limited to 'askbot/media/js/wmd')
| -rw-r--r-- | askbot/media/js/wmd/wmd.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/askbot/media/js/wmd/wmd.js b/askbot/media/js/wmd/wmd.js index b3ed3f38..02ebf0c9 100644 --- a/askbot/media/js/wmd/wmd.js +++ b/askbot/media/js/wmd/wmd.js @@ -2480,8 +2480,7 @@ Attacklab.wmd_env = {}; Attacklab.account_options = {}; Attacklab.wmd_defaults = {version:1, output:"Markdown", lineLength:40, delayLoad:false}; -//@todo: this needs to be moved out of the wmd.js as we have askbot-specific code here -if(!Attacklab.wmd && askbot['settings']['editorType'] === 'markdown') { +if (askbot['settings']['editorType'] == 'markdown' && !Attacklab.wmd) { Attacklab.wmd = function() { Attacklab.loadEnv = function() { var mergeEnv = function(env) { @@ -2510,4 +2509,3 @@ if(!Attacklab.wmd && askbot['settings']['editorType'] === 'markdown') { Attacklab.wmdBase(); Attacklab.Util.startEditor(); }; - |