perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00
parent 0e3a022086
commit 7229a9cdaf
90 changed files with 3529 additions and 491 deletions
--- a/common/static/coffee/src/discussion/utils.coffee
+++ b/common/static/coffee/src/discussion/utils.coffee
@@ -249,7 +249,10 @@ class @DiscussionUtil
          $3
      else if RE_DISPLAYMATH.test(text)
        text = text.replace RE_DISPLAYMATH, ($0, $1, $2, $3) ->
-          processedText += $1 + processor("$$" + $2 + "$$", 'display')
+          #processedText += $1 + processor("$$" + $2 + "$$", 'display')
+          #bug fix, ordering is off
+          processedText =  processor("$$" + $2 + "$$", 'display') + processedText
+          processedText = $1 + processedText
          $3
      else
        processedText += text