Merge pull request +13301 from c9/update

Update smartface

node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js

@@ -75,7 +75,7 @@ var ColdfusionHighlightRules = function() {
         this.$rules[s].unshift(cfTag);
     }, this);
     
-    this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "cfjs-", "cfscript");
+    this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "cfjs-", "cfscript");
 
     this.normalizeRules();
 };

node_modules/ace/lib/ace/mode/html_highlight_rules.js

@@ -99,7 +99,7 @@ var HtmlHighlightRules = function() {
     });
 
     this.embedTagRules(CssHighlightRules, "css-", "style");
-    this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "js-", "script");
+    this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "js-", "script");
 
     if (this.constructor === HtmlHighlightRules)
         this.normalizeRules();

node_modules/ace/lib/ace/mode/javascript_highlight_rules.js

@@ -383,7 +383,7 @@ var JavaScriptHighlightRules = function(options) {
             }]
         });
         
-        if (!options || !options.noJSX)
+        if (!options || options.jsx != false)
             JSX.call(this);
     }
     

node_modules/ace/lib/ace/mode/typescript_highlight_rules.js

@@ -86,7 +86,7 @@ var TypeScriptHighlightRules = function(options) {
         }
     ];
 
-    var JSRules = new JavaScriptHighlightRules({jsx: options && options.jsx}).getRules();
+    var JSRules = new JavaScriptHighlightRules({jsx: (options && options.jsx) == true}).getRules();
     
     JSRules.start = tsRules.concat(JSRules.start);
     this.$rules = JSRules;