From 00e45c0d3c3f5b2913e32dc05bfbea366fb894ff Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 13 Jul 2016 15:36:34 -0400
Subject: [PATCH] FIX: Safari strict mode errors

---
 .../discourse/lib/raw-handlebars.js.es6       | 91 +++++++++----------
 .../engines/discourse-markdown.js.es6         |  2 +-
 .../engines/discourse-markdown/bbcode.js.es6  | 64 +++++++------
 3 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6
index e33c912009b..423d8e88352 100644
--- a/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse/lib/raw-handlebars.js.es6
@@ -14,7 +14,7 @@ const RawHandlebars = Handlebars.create();
 RawHandlebars.helper = function() {};
 RawHandlebars.helpers = objectCreate(Handlebars.helpers);
 
-RawHandlebars.helpers.get = function(context, options){
+RawHandlebars.helpers['get'] = function(context, options) {
   var firstContext =  options.contexts[0];
   var val = firstContext[context];
 
@@ -38,7 +38,7 @@ function stringCompatHelper(fn) {
 RawHandlebars.registerHelper('each', function(localName,inKeyword,contextName,options){
   var list = Em.get(this, contextName);
   var output = [];
-  var innerContext = Object.create(this);
+  var innerContext = objectCreate(this);
   for (var i=0; i<list.length; i++) {
     innerContext[localName] = list[i];
     output.push(options.fn(innerContext));
@@ -51,6 +51,49 @@ stringCompatHelper("unless");
 stringCompatHelper("with");
 
 
+function buildPath(blk, args) {
+  var result = { type: "PathExpression",
+    data: false,
+    depth: blk.path.depth,
+    loc: blk.path.loc };
+
+  // Server side precompile doesn't have jquery.extend
+  Object.keys(args).forEach(function (a) {
+    result[a] = args[a];
+  });
+
+  return result;
+}
+
+function replaceGet(ast) {
+  var visitor = new Handlebars.Visitor();
+  visitor.mutating = true;
+
+  visitor.MustacheStatement = function(mustache) {
+    if (!(mustache.params.length || mustache.hash)) {
+      mustache.params[0] = mustache.path;
+      mustache.path = buildPath(mustache, { parts: ['get'], original: 'get', strict: true, falsy: true });
+    }
+    return Handlebars.Visitor.prototype.MustacheStatement.call(this, mustache);
+  };
+
+  // rewrite `each x as |y|` as each y in x`
+  // This allows us to use the same syntax in all templates
+  visitor.BlockStatement = function(block) {
+    if (block.path.original === 'each' && block.params.length === 1) {
+      var paramName = block.program.blockParams[0];
+      block.params = [ buildPath(block, { original: paramName }),
+      { type: "CommentStatement", value: "in" },
+      block.params[0] ];
+      delete block.program.blockParams;
+    }
+
+    return Handlebars.Visitor.prototype.BlockStatement.call(this, block);
+  };
+
+  visitor.accept(ast);
+}
+
 if (Handlebars.Compiler) {
   RawHandlebars.Compiler = function() {};
   RawHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
@@ -62,50 +105,6 @@ if (Handlebars.Compiler) {
   RawHandlebars.JavaScriptCompiler.prototype.compiler = RawHandlebars.JavaScriptCompiler;
   RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
 
-  function buildPath(blk, args) {
-
-    var result = { type: "PathExpression",
-                   data: false,
-                   depth: blk.path.depth,
-                   loc: blk.path.loc };
-
-    // Server side precompile doesn't have jquery.extend
-    Object.keys(args).forEach(function (a) {
-      result[a] = args[a];
-    });
-
-    return result;
-  }
-
-  function replaceGet(ast) {
-    var visitor = new Handlebars.Visitor();
-    visitor.mutating = true;
-
-    visitor.MustacheStatement = function(mustache) {
-      if (!(mustache.params.length || mustache.hash)) {
-        mustache.params[0] = mustache.path;
-        mustache.path = buildPath(mustache, { parts: ['get'], original: 'get', strict: true, falsy: true });
-      }
-      return Handlebars.Visitor.prototype.MustacheStatement.call(this, mustache);
-    };
-
-    // rewrite `each x as |y|` as each y in x`
-    // This allows us to use the same syntax in all templates
-    visitor.BlockStatement = function(block) {
-      if (block.path.original === 'each' && block.params.length === 1) {
-        var paramName = block.program.blockParams[0];
-        block.params = [ buildPath(block, { original: paramName }),
-                         { type: "CommentStatement", value: "in" },
-                         block.params[0] ];
-        delete block.program.blockParams;
-      }
-
-      return Handlebars.Visitor.prototype.BlockStatement.call(this, block);
-    };
-
-    visitor.accept(ast);
-  }
-
   RawHandlebars.precompile = function(value, asObject) {
     var ast = Handlebars.parse(value);
     replaceGet(ast);
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
index 3203cdc5d78..a24375efef4 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
@@ -399,7 +399,7 @@ export function cook(raw, opts) {
   if (keys.length) {
     let found = true;
 
-    function unhoist(key) {
+    const unhoist = function(key) {
       result = result.replace(new RegExp(key, "g"), function() {
         found = true;
         return hoisted[key];
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
index f7337c379fc..d50880c2938 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
@@ -45,10 +45,7 @@ export function register(helper, codeName, args, emitter) {
   });
 };
 
-export function setup(helper) {
-
-  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
-
+export function builders(helper) {
   function replaceBBCode(tag, emitter, opts) {
     const start = `[${tag}]`;
     const stop = `[/${tag}]`;
@@ -59,34 +56,49 @@ export function setup(helper) {
 
     opts = _.merge(opts, { start: start.toUpperCase(), stop: stop.toUpperCase(), emitter });
     helper.inlineBetween(opts);
-  };
-
-  function rawBBCode(tag, emitter) {
-    replaceBBCode(tag, emitter, { rawContents: true });
   }
 
-  function removeEmptyLines(contents) {
-    const result = [];
-    for (let i=0; i < contents.length; i++) {
-      if (contents[i] !== "\n") { result.push(contents[i]); }
-    }
-    return result;
-  }
+  return {
+    replaceBBCode,
 
-  function replaceBBCodeParamsRaw(tag, emitter) {
-    var opts = {
-      rawContents: true,
-      emitter(contents) {
-        const m = /^([^\]]+)\]([\S\s]*)$/.exec(contents);
-        if (m) { return emitter.call(this, m[1], m[2]); }
+    register(codeName, args, emitter) {
+      register(helper, codeName, args, emitter);
+    },
+
+    rawBBCode(tag, emitter) {
+      replaceBBCode(tag, emitter, { rawContents: true });
+    },
+
+    removeEmptyLines(contents) {
+      const result = [];
+      for (let i=0; i < contents.length; i++) {
+        if (contents[i] !== "\n") { result.push(contents[i]); }
       }
-    };
+      return result;
+    },
 
-    helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
+    replaceBBCodeParamsRaw(tag, emitter) {
+      var opts = {
+        rawContents: true,
+        emitter(contents) {
+          const m = /^([^\]]+)\]([\S\s]*)$/.exec(contents);
+          if (m) { return emitter.call(this, m[1], m[2]); }
+        }
+      };
 
-    tag = tag.toUpperCase();
-    helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
-  }
+      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
+
+      tag = tag.toUpperCase();
+      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
+    }
+  };
+}
+
+export function setup(helper) {
+
+  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
+
+  const { replaceBBCode, rawBBCode, removeEmptyLines, replaceBBCodeParamsRaw } = builders(helper);
 
   replaceBBCode('b', contents => ['span', {'class': 'bbcode-b'}].concat(contents));
   replaceBBCode('i', contents => ['span', {'class': 'bbcode-i'}].concat(contents));