Revert "Proof of concept: Load controller via ES6 module in Discourse"

This reverts commit 0327f469c1.

app/assets/javascripts/discourse/controllers/history_controller.js

@@ -7,7 +7,7 @@
   @uses Discourse.ModalFunctionality
   @module Discourse
 **/
-export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
+Discourse.HistoryController = Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
   loading: false,
   viewMode: "side_by_side",
   revisionsTextKey: "post.revisions.controls.comparing_previous_to_current_out_of_total",

app/assets/javascripts/discourse/ember/resolver.js

@@ -1,4 +1,3 @@
-/* global requirejs, require */
 /**
   A custom resolver to allow template names in the format we like.
 
@@ -9,17 +8,6 @@
 **/
 Discourse.Resolver = Ember.DefaultResolver.extend({
 
-  resolveController: function(parsedName) {
-    var moduleName = "discourse/controllers/" + parsedName.fullNameWithoutType,
-        module = requirejs.entries[moduleName];
-
-    if (module) {
-      module = require(moduleName, null, null, true /* force sync */);
-      if (module && module['default']) { module = module['default']; }
-    }
-    return module || this._super(parsedName);
-  },
-
   /**
     Attaches a view and wires up the container properly
 

app/assets/javascripts/vendor.js

@@ -5,9 +5,9 @@
 //= require jquery_include.js
 //= require ember_include.js
 
-//= require loader
 //= require message-bus
 //= require jquery.ui.widget.js
+//= require_tree ./discourse/ember
 //= require LAB.js
 //= require Markdown.Converter.js
 //= require better_markdown.js
@@ -38,4 +38,3 @@
 //= require lock-on.js
 //= require ember-cloaking
 //= require break_string
-//= require_tree ./discourse/ember