bundle the loader to simplify end-usage

bustle · Sep 29, 2014 · d4661eb · d4661eb
1 parent 40937bd
commit d4661eb
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 23 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -93,7 +93,7 @@ var ContentKitDemo = exports.ContentKitDemo = {
 };
 
 // Initialize
-if (editor) {
+if (window.editor) {
   ContentKitDemo.syncCodePane(editor);
   editor.on('update', function(data) {
     ContentKitDemo.syncCodePane(this);

diff --git a/demo/index.html b/demo/index.html
@@ -9,7 +9,6 @@
 
   <!-- CSS just for the demo page -->
   <link href="demo.css" rel="stylesheet">
-
 </head>
 <body>
 
@@ -70,17 +69,12 @@ <h3>Keyboard shortcuts:</h3>
   </div>
 
   <!-- Include ContentKit JS -->
-  <script src="loader.js"></script>
   <script src="content-kit-editor.js"></script>
-  <script>window.ContentKit = require('content-kit')['default'];</script>
-
-  <script>
-    // Initialize a new Editor
-    var editor = new ContentKit.Editor('.editor');
-  </script>
+  <!-- Initialize a new Editor -->
+  <script>var editor = new ContentKit.Editor('.editor');</script>
 
   <!-- JS just for the demo page -->
   <script src="demo.js"></script>
-
+  
 </body>
 </html>
diff --git a/gulpfile.js b/gulpfile.js
@@ -8,13 +8,15 @@ var util   = require('gulp-util');
 var open   = require('gulp-open');
 var rimraf = require('gulp-rimraf');
 var insert = require('gulp-insert');
+var gulpif = require('gulp-if');
 var es6ModuleTranspiler = require('gulp-es6-module-transpiler');
 
 // ------------------------------------------- 
 
 var pkg = require('./package.json');
 
 var jsSrc = [
+  './src/js/ext/loader.js',
   './src/js/content-kit.js',
   './src/js/**/*.js'
 ];
@@ -33,6 +35,7 @@ var cssSrc = [
 var distDest = './dist/';
 var jsDistName = 'content-kit-editor.js';
 var jsDistPath = distDest + jsDistName;
+var pathIsES6File = /^((?!loader).)*$/;
 var cssDistName = 'content-kit-editor.css';
 
 var testRunner = './tests/index.html';
@@ -57,20 +60,22 @@ var iifeHeader = ['',
                   ''].join('\n'); 
 var iifeFooter = ['',
                   '}(this, document));',
-                  ''].join('\n'); 
+                  ''].join('\n');
 
+var AMDInvoke =  "if (typeof window !== 'undefined') { window.ContentKit = require('content-kit')['default']; }"
 
 // JSHint javascript code linting
 gulp.task('lint', function() {
   return gulp.src(jsSrc)
-             .pipe(jshint('.jshintrc'))
+             .pipe(gulpif(pathIsES6File, jshint('.jshintrc')))
              .pipe(jshint.reporter('default'));
 });
 
 gulp.task('build-js', ['lint'], function() {
   return gulp.src(jsSrc)
-             .pipe(es6ModuleTranspiler({ type: 'amd' }))
+             .pipe(gulpif(pathIsES6File, es6ModuleTranspiler({ type: 'amd' })))
              .pipe(concat(jsDistName))
+             .pipe(insert.append(AMDInvoke))
              .pipe(insert.wrap(iifeHeader, iifeFooter))
              .pipe(header(banner, { pkg : pkg } ))
              .pipe(gulp.dest(distDest));

diff --git a/package.json b/package.json
@@ -5,8 +5,8 @@
   "repository": "https://github.com/ContentKit/content-kit-editor",
   "main": "dist/content-kit-editor.js",
   "scripts": {
-    "start" : "node server/index.js",
-    "test"  : "gulp test"
+    "start": "node server/index.js",
+    "test": "gulp test"
   },
   "keywords": [
     "html",
@@ -28,6 +28,7 @@
     "gulp-concat": "~2.1.7",
     "gulp-es6-module-transpiler": "^0.1.3",
     "gulp-header": "~1.0.2",
+    "gulp-if": "^1.2.4",
     "gulp-insert": "^0.4.0",
     "gulp-jshint": "~1.3.4",
     "gulp-less": "^1.3.1",

diff --git a/src/js/content-kit-editor/commands/image.js b/src/js/content-kit-editor/commands/image.js
@@ -2,7 +2,7 @@ import Command from './base';
 import Message from '../views/message';
 import ImageModel from '../../content-kit-compiler/models/image';
 import { inherit } from '../../content-kit-utils/object-utils';
-import { FileUploader } from '../../ext/content-kit-services';
+import { FileUploader } from '../utils/http-utils';
 
 function createFileInput(command) {
   var fileInput = document.createElement('input');

diff --git a/src/js/content-kit-editor/commands/oembed.js b/src/js/content-kit-editor/commands/oembed.js
@@ -3,7 +3,7 @@ import Prompt from '../views/prompt';
 import Message from '../views/message';
 import EmbedModel from '../../content-kit-compiler/models/embed';
 import { inherit } from '../../content-kit-utils/object-utils';
-import { OEmbedder } from '../../ext/content-kit-services';
+import { OEmbedder } from '../utils/http-utils';
 
 function loadTwitterWidgets(element) {
   if (window.twttr) {

diff --git a/src/js/ext/content-kit-services.js → ...js/content-kit-editor/utils/http-utils.js b/src/js/ext/content-kit-services.js → ...js/content-kit-editor/utils/http-utils.js
diff --git a/src/js/content-kit.js b/src/js/content-kit.js
@@ -6,9 +6,9 @@ import EmbedModel from './content-kit-compiler/models/embed';
 import Compiler from './content-kit-compiler/compiler';
 import HTMLParser from './content-kit-compiler/parsers/html-parser';
 import HTMLRenderer from './content-kit-compiler/renderers/html-renderer';
-
 import EditorFactory from './content-kit-editor/editor/editor-factory';
 
+// Create a namespace and selectivly expose public modules
 var ContentKit = {};
 ContentKit.Type = Type;
 ContentKit.BlockModel = BlockModel;
@@ -18,7 +18,6 @@ ContentKit.EmbedModel = EmbedModel;
 ContentKit.Compiler = Compiler;
 ContentKit.HTMLParser = HTMLParser;
 ContentKit.HTMLRenderer = HTMLRenderer;
-
 ContentKit.Editor = EditorFactory;
 
 export default ContentKit;
diff --git a/ext/loader.js → src/js/ext/loader.js b/ext/loader.js → src/js/ext/loader.js
@@ -61,7 +61,9 @@ var define, requireModule, require, requirejs;
       if (dep === 'exports') {
         module.exports = reified[i] = seen;
       } else if (dep === 'require') {
-        reified[i] = require;
+        reified[i] = function requireDep(dep) {
+          return require(resolve(dep, name));
+        };
       } else if (dep === 'module') {
         mod.exports = seen;
         module = reified[i] = mod;
@@ -103,11 +105,18 @@ var define, requireModule, require, requirejs;
       }
     });
 
+    var obj;
     if (module === undefined && reified.module.exports) {
-      return (seen[name] = reified.module.exports);
+      obj = reified.module.exports;
     } else {
-      return (seen[name] = module);
+      obj = seen[name] = module;
     }
+
+    if (obj !== null && (typeof obj === 'object' || typeof obj === 'function') && obj['default'] === undefined) {
+      obj['default'] = obj;
+    }
+
+    return (seen[name] = obj);
   };
 
   function resolve(child, name) {
@@ -133,4 +142,4 @@ var define, requireModule, require, requirejs;
     requirejs.entries = requirejs._eak_seen = registry = {};
     seen = state = {};
   };
-})();
+})();