Make MediumEditor global + Fix remaining Selection + Util refs

yabwe · Aug 14, 2015 · 266261f · 266261f
1 parent 9814f99
commit 266261f
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 76 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -13,6 +13,7 @@ module.exports = function (grunt) {
             globalConfig: globalConfig
         },
         srcFiles = [
+            'src/js/globals.js',
             'src/js/util.js',
             'src/js/defaults/buttons.js',
             'src/js/defaults/options.js',
@@ -31,7 +32,6 @@ module.exports = function (grunt) {
             'src/js/extensions/placeholder.js',
             'src/js/extensions/toolbar.js',
             'src/js/extensions/deprecated/image-dragging.js',
-            'src/js/defaults/options.js',
             'src/js/defaults/extensions.js',
             'src/js/core.js',
             'src/js/version.js'

diff --git a/spec/selection.spec.js b/spec/selection.spec.js
@@ -1,10 +1,9 @@
 /*global describe, it, expect, spyOn,
          afterEach, beforeEach, fireEvent,
          jasmine, selectElementContents, setupTestHelpers,
-         selectElementContentsAndFire, Selection,
-         placeCursorInsideElement */
+         selectElementContentsAndFire, placeCursorInsideElement */
 
-describe('Selection TestCase', function () {
+describe('MediumEditor.selection TestCase', function () {
     'use strict';
 
     beforeEach(function () {
@@ -19,7 +18,6 @@ describe('Selection TestCase', function () {
     describe('Exposure', function () {
         it('is exposed on the MediumEditor ctor', function () {
             expect(MediumEditor.selection).toBeTruthy();
-            expect(MediumEditor.selection).toEqual(Selection);
         });
     });
 

diff --git a/spec/util.spec.js b/spec/util.spec.js
@@ -1,7 +1,7 @@
-/*global Util, describe, it, expect, spyOn,
+/*global describe, it, expect, spyOn,
          afterEach, beforeEach, setupTestHelpers, selectElementContents */
 
-describe('Util', function () {
+describe('MediumEditor.util', function () {
     'use strict';
 
     beforeEach(function () {
@@ -15,7 +15,6 @@ describe('Util', function () {
     describe('Exposure', function () {
         it('is exposed on the MediumEditor ctor', function () {
             expect(MediumEditor.util).toBeTruthy();
-            expect(MediumEditor.util).toEqual(Util);
         });
 
     });

diff --git a/src/js/core.js b/src/js/core.js
diff --git a/src/js/events.js b/src/js/events.js
@@ -1,5 +1,3 @@
-/*global Util */
-
 var Events;
 
 (function () {
@@ -15,7 +13,7 @@ var Events;
     };
 
     Events.prototype = {
-        InputEventOnContenteditableSupported: !Util.isIE,
+        InputEventOnContenteditableSupported: !MediumEditor.util.isIE,
 
         // Helpers for event handling
 

diff --git a/src/js/extension.js b/src/js/extension.js
@@ -1,11 +1,9 @@
-/* global Util */
-
 var Extension;
 (function () {
     'use strict';
 
     Extension = function (options) {
-        Util.extend(this, options);
+        MediumEditor.util.extend(this, options);
     };
 
     Extension.extend = function (protoProps) {
@@ -49,7 +47,7 @@ var Extension;
         }
 
         // das statics (.extend comes over, so your subclass can have subclasses too)
-        Util.extend(child, parent);
+        MediumEditor.util.extend(child, parent);
 
         // Set the prototype chain to inherit from `parent`, without calling
         // `parent`'s constructor function.
@@ -60,7 +58,7 @@ var Extension;
         child.prototype = new Surrogate();
 
         if (protoProps) {
-            Util.extend(child.prototype, protoProps);
+            MediumEditor.util.extend(child.prototype, protoProps);
         }
 
         // todo: $super?

diff --git a/src/js/extensions/form.js b/src/js/extensions/form.js
@@ -6,7 +6,7 @@ var FormExtension;
 
     var noop = function () {};
 
-    /* Base functionality for an extension whcih will display
+    /* Base functionality for an extension which will display
      * a 'form' inside the toolbar
      */
     FormExtension = Button.extend({

diff --git a/src/js/globals.js b/src/js/globals.js
@@ -0,0 +1,6 @@
+/*jshint unused: false */
+function MediumEditor(elements, options) {
+    'use strict';
+    return this.init(elements, options);
+}
+/*jshint unused: true */
diff --git a/src/js/selection.js b/src/js/selection.js
@@ -1,5 +1,3 @@
-var Selection;
-
 (function () {
     'use strict';
 
@@ -11,7 +9,7 @@ var Selection;
         }
     }
 
-    Selection = {
+    var Selection = {
         findMatchingSelectionParent: function (testElementFunction, contentWindow) {
             var selection = contentWindow.getSelection(),
                 range,
@@ -422,4 +420,6 @@ var Selection;
             return startNode;
         }
     };
+
+    MediumEditor.selection = Selection;
 }());
diff --git a/src/js/util.js b/src/js/util.js
@@ -1,7 +1,5 @@
 /*global NodeFilter*/
 
-var Util;
-
 (function (window) {
     'use strict';
 
@@ -24,7 +22,7 @@ var Util;
         return dest;
     }
 
-    Util = {
+    var Util = {
 
         // http://stackoverflow.com/questions/17907445/how-to-detect-ie11#comment30165888_17907562
         // by rg89
@@ -864,4 +862,6 @@ var Util;
             }
         }
     };
+
+    MediumEditor.util = Util;
 }(window));