FIX: Safari strict mode errors

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,19 +51,7 @@ stringCompatHelper("unless");
 stringCompatHelper("with");
 
 
-if (Handlebars.Compiler) {
+function buildPath(blk, args) {
-  RawHandlebars.Compiler = function() {};
-  RawHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
-  RawHandlebars.Compiler.prototype.compiler = RawHandlebars.Compiler;
-
-  RawHandlebars.JavaScriptCompiler = function() {};
-
-  RawHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
-  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,
@@ -75,9 +63,9 @@ if (Handlebars.Compiler) {
   });
 
   return result;
-  }
+}
 
-  function replaceGet(ast) {
+function replaceGet(ast) {
   var visitor = new Handlebars.Visitor();
   visitor.mutating = true;
 
@@ -104,7 +92,18 @@ if (Handlebars.Compiler) {
   };
 
   visitor.accept(ast);
-  }
+}
+
+if (Handlebars.Compiler) {
+  RawHandlebars.Compiler = function() {};
+  RawHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+  RawHandlebars.Compiler.prototype.compiler = RawHandlebars.Compiler;
+
+  RawHandlebars.JavaScriptCompiler = function() {};
+
+  RawHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
+  RawHandlebars.JavaScriptCompiler.prototype.compiler = RawHandlebars.JavaScriptCompiler;
+  RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
 
   RawHandlebars.precompile = function(value, asObject) {
     var ast = Handlebars.parse(value);

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];

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) {
+export function builders(helper) {
-
-  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
-
   function replaceBBCode(tag, emitter, opts) {
     const start = `[${tag}]`;
     const stop = `[/${tag}]`;
@@ -59,21 +56,28 @@ 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) {
+  return {
+    replaceBBCode,
+
+    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;
-  }
+    },
 
-  function replaceBBCodeParamsRaw(tag, emitter) {
+    replaceBBCodeParamsRaw(tag, emitter) {
       var opts = {
         rawContents: true,
         emitter(contents) {
@@ -87,6 +91,14 @@ export function setup(helper) {
       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));