Remove all define in src

package.json

@@ -30,7 +30,9 @@
     "babel-preset-es2015": "^6.24.1",
     "chai": "^3.5.0",
     "documentation": "^4.0.0-beta2",
+    "expect": "^1.20.2",
     "istanbul": "^0.4.2",
+    "jsdom": "^11.0.0",
     "mocha": "^3.1.2",
     "node-sass": "^3.4.2",
     "requirejs": "^2.3.2",
@@ -55,14 +57,19 @@
     "template",
     "editor"
   ],
+  "babel": {
+    "presets": [
+      "es2015"
+    ]
+  },
   "scripts": {
     "lint": "eslint src",
-    "build": "WEBPACK_ENV=prod && npm run v:patch && webpack && npm run build:css",
+    "build": "WEBPACK_ENV=prod && npm run test && npm run v:patch && webpack && npm run build:css",
     "build:css": "node-sass styles/scss/main.scss dist/css/grapesjs.min.css",
     "build:fonts": "./node_modules/.bin/grunt build:fonts",
     "v:patch": "npm version --no-git-tag-version patch",
     "start": "WEBPACK_ENV=dev webpack-dev-server --progress --colors & npm run build:css -- -w",
-    "test": "mocha --compilers js:babel-core/register --require ./test/helper.js --recursive ./test/*.js",
+    "test": "NODE_PATH=./src mocha --compilers js:babel-core/register --require test/helper.js --recursive test/main.js",
     "test:dev": "npm test -- -R min -w"
   }
 }

src/asset_manager/config/config.js

@@ -1,5 +1,4 @@
-define(function () {
-	return {
+module.exports =  {
   // Default assets
   assets: [],
 
@@ -15,4 +14,3 @@ define(function () {
   // Label for the add button
   addBtnText: 'Add image',
 };
-});

src/asset_manager/index.js

@@ -33,9 +33,8 @@
  *  uploadText: 'Drop files here or click to upload',
  * }
  */
-define(function(require) {
 
-  return function() {
+module.exports = function() {
   var c = {},
   Assets = require('./model/Assets'),
   AssetsView = require('./view/AssetsView'),
@@ -238,4 +237,3 @@ define(function(require) {
 
   };
 };
-});

src/asset_manager/model/Asset.js

@@ -1,6 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
+
 module.exports = Backbone.Model.extend({
 
   idAttribute: 'src',
@@ -29,4 +28,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/asset_manager/model/AssetImage.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Asset = require('./Asset');
+
 module.exports = Asset.extend({
 
   defaults: _.extend({}, Asset.prototype.defaults, {
@@ -12,4 +11,3 @@ define(function(require, exports, module){
   }),
 
 });
-});

src/asset_manager/model/Assets.js

@@ -1,8 +1,7 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Asset = require('./Asset');
 var AssetImage = require('./AssetImage');
+
 module.exports = Backbone.Collection.extend({
 
 	model:	AssetImage,
@@ -67,4 +66,3 @@ define(function(require, exports, module){
 
 
 });
-});

src/asset_manager/view/AssetImageView.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var AssetView = require('./AssetView');
 var assetTemplate = require('text!./../template/assetImage.html');
+
 module.exports = AssetView.extend({
 
   events:{
@@ -96,4 +95,3 @@ define(function(require, exports, module){
     return this;
   },
 });
-});

src/asset_manager/view/AssetView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({
@@ -12,5 +10,3 @@ define(function(require, exports, module){
     this.listenTo( this.model, 'destroy remove', this.remove);
   },
 });
-
-});

src/asset_manager/view/AssetsView.js

@@ -1,10 +1,9 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var AssetView = require('./AssetView');
 var AssetImageView = require('./AssetImageView');
 var FileUploader = require('./FileUploader');
 var assetsTemplate = require('text!./../template/assets.html');
+
 module.exports = Backbone.View.extend({
 
   template: _.template(assetsTemplate),
@@ -133,4 +132,3 @@ define(function(require, exports, module){
     return this;
   }
 });
-});

src/asset_manager/view/FileUploader.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var fileUploaderTemplate = require('text!./../template/fileUploader.html');
+
 module.exports = Backbone.View.extend({
 
   template:   _.template(fileUploaderTemplate),
@@ -96,4 +95,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/block_manager/config/config.js

@@ -1,7 +1,5 @@
-define(function () {
-	return {
+module.exports = {
 
   'blocks': [],
 
 };
-});

src/block_manager/index.js

@@ -25,9 +25,7 @@
  * }
  * ...
  */
-define(function(require) {
-
-  return function() {
+module.exports = function() {
   var c = {},
   defaults = require('./config/config'),
   Blocks = require('./model/Blocks'),
@@ -118,5 +116,3 @@ define(function(require) {
   };
 
 };
-
-});

src/block_manager/model/Block.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
@@ -11,4 +9,3 @@ define(function(require, exports, module){
   },
 
 });
-  });

src/block_manager/model/Blocks.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Block = require('./Block');
 
 module.exports = Backbone.Collection.extend({
-
   model: Block,
-
-    });
 });

src/block_manager/view/BlockView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({
@@ -48,4 +46,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/block_manager/view/BlocksView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var BlockView = require('./BlockView');
 
@@ -120,4 +118,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/canvas/config/config.js

@@ -1,5 +1,4 @@
-define(function () {
-	return {
+module.exports = {
 
   stylePrefix: 'cv-',
 
@@ -13,4 +12,3 @@ define(function () {
   scripts: []
 
 };
-});

src/canvas/index.js

@@ -1,6 +1,4 @@
-define(function(require) {
-
-  return function() {
+module.exports = function() {
   var c = {},
   defaults = require('./config/config'),
   Canvas = require('./model/Canvas'),
@@ -325,5 +323,3 @@ define(function(require) {
     },
   };
 };
-
-});

src/canvas/model/Canvas.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Frame = require('./Frame');
 
@@ -17,4 +15,3 @@ define(function(require, exports, module){
   },
 
 });
-	});

src/canvas/model/Frame.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
@@ -12,4 +10,3 @@ define(function(require, exports, module){
   },
 
 });
-  });

src/canvas/view/CanvasView.js

@@ -1,10 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var FrameView = require('./FrameView');
-  /**
-   * @class CanvasView
-   * */
+
 module.exports = Backbone.View.extend({
 
   initialize: function(o) {
@@ -268,4 +264,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/canvas/view/FrameView.js

@@ -1,9 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-  /**
-   * @class CanvasView
-   * */
+
 module.exports = Backbone.View.extend({
 
   tagName: 'iframe',
@@ -53,4 +49,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/code_manager/config/config.js

@@ -1,8 +1,6 @@
-define(function () {
-	return {
+module.exports = {
   // Style prefix
   stylePrefix: 'cm-',
 
   inlineCss: false,
 };
-});

src/code_manager/index.js

@@ -17,9 +17,7 @@
  *
  * @module CodeManager
  */
-define(function(require) {
-
-	var CodeManager = function() {
+module.exports = function() {
 
   var c = {},
   defaults = require('./config/config'),
@@ -221,7 +219,3 @@ define(function(require) {
   };
 
 };
-
-	return CodeManager;
-
-});

src/code_manager/model/CodeMirrorEditor.js

@@ -1,13 +1,9 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var CodeMirror = require('codemirror/lib/codemirror');
 var htmlMode = require('codemirror/mode/htmlmixed/htmlmixed');
 var cssMode = require('codemirror/mode/css/css');
 var formatting = require('formatting');
-		/**
-		 * @class CodeViewer
-		 * */
+
 module.exports = Backbone.Model.extend({
 
   defaults: {
@@ -48,4 +44,3 @@ define(function(require, exports, module){
   },
 
 });
-	});

src/code_manager/model/CssGenerator.js

@@ -1,9 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-    /**
-     * @class CssGenerator
-     * */
+
 module.exports = Backbone.Model.extend({
 
   initialize: function() {
@@ -149,4 +145,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/code_manager/model/HtmlGenerator.js

@@ -1,9 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-		/**
-		 * @class HtmlGenerator
-		 * */
+
 module.exports = Backbone.Model.extend({
 
   /** @inheritdoc */
@@ -21,4 +17,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/code_manager/model/JsGenerator.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
@@ -61,4 +59,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/code_manager/model/JsonGenerator.js

@@ -1,9 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-		/**
-		 * @class JsonGenerator
-		 * */
+
 module.exports = Backbone.Model.extend({
 
   /** @inheritdoc */
@@ -38,4 +34,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/code_manager/view/EditorView.js

@@ -1,10 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var vTemplate = require('text!./../template/editor.html');
-		/** 
-		 * @class EditorView
-		 * */
+
 module.exports = Backbone.View.extend({
 
   template: _.template(vTemplate),
@@ -24,4 +20,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/commands/config/config.js

@@ -1,5 +1,4 @@
-define(function () {
-	return {
+module.exports = {
 
   ESCAPE_KEY: 27,
 
@@ -22,4 +21,3 @@ define(function () {
   // Minimum width (in px) of component on creation
   minComponentW: 50,
 };
-});

src/commands/index.js

@@ -38,9 +38,8 @@
  * },
  * ...
  */
-define(function(require) {
 
-  return function() {
+module.exports = function() {
   var c = {},
   commands = {},
   defaultCommands = {},
@@ -235,4 +234,3 @@ define(function(require) {
   };
 
 };
-});

src/commands/model/Command.js

@@ -1,9 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-	/**
-	 * @class Command
-	 * */
+
 module.exports = Backbone.Model.extend({
 
   defaults :{
@@ -11,4 +7,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/commands/model/Commands.js

@@ -1,13 +1,8 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Command = require('./Command');
-		/**
-		 * @class Commands
-		 * */
+
 module.exports = Backbone.Collection.extend({
 
   model: Command,
 
 });
-});

src/commands/view/CommandAbstract.js

@@ -1,10 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
-		/**
-		 * @class CommandAbstract
-		 * @private
-		 * */
+
 module.exports = Backbone.View.extend({
 
 	/**
@@ -114,4 +109,3 @@ define(function(require, exports, module){
 	stop: function(em, sender) {},
 
 });
-	});

src/commands/view/CreateComponent.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var SelectPosition = require('./SelectPosition');
 
@@ -230,4 +228,3 @@ define(function(require, exports, module){
     this.$wrapper.unbind();
   }
 });
-	});

src/commands/view/DeleteComponent.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var SelectComponent = require('./SelectComponent');
-		/**
-		 * @class DeleteComponent
-		 * @private
-		 * */
+
 module.exports = _.extend({},SelectComponent,{
 
   init: function(o){
@@ -14,8 +9,7 @@ define(function(require, exports, module){
     this.badgeClass  = this.pfx + 'badge-red';
   },
 
-			enable: function()
-			{
+  enable: function() {
     var that = this;
     this.$el.find('*')
       .mouseover(this.startDelete)
@@ -28,8 +22,7 @@ define(function(require, exports, module){
    * @param {Object}  e
    * @private
    */
-			startDelete: function(e)
-			{
+  startDelete: function(e) {
       e.stopPropagation();
       var $this   =  $(e.target);
 
@@ -46,8 +39,7 @@ define(function(require, exports, module){
    * @param {Object}  e
    * @private
    */
-			stopDelete: function(e)
-			{
+  stopDelete: function(e) {
       e.stopPropagation();
       var $this   =  $(e.target);
       $this.removeClass(this.hoverClass);
@@ -62,8 +54,7 @@ define(function(require, exports, module){
    * @param {Object}  e
    * @private
    */
-			onDelete: function(e)
-			{
+  onDelete: function(e) {
     e.stopPropagation();
     var $this = $(e.target);
 
@@ -81,10 +72,8 @@ define(function(require, exports, module){
    * @param   {Object}  model
    * @private
    * */
-			updateBadgeLabel: function (model)
-			{
+  updateBadgeLabel: function (model) {
     this.badge.html( 'Remove ' + model.getName() );
   },
 
 });
-	});

src/commands/view/ExportTemplate.js

@@ -1,9 +1,4 @@
-define(function() {
-		/**
-		 * @class ExportTemplate
-		 * @private
-		 * */
-		return {
+module.exports = {
 
   run: function(editor, sender) {
     this.sender = sender;
@@ -75,4 +70,3 @@ define(function() {
 
   stop: function(){}
 };
-	});

src/commands/view/Fullscreen.js

@@ -1,6 +1,4 @@
-define(function() {
-
-		return {
+module.exports = {
   /**
    * Check if fullscreen mode is enabled
    * @return {Boolean}
@@ -83,4 +81,3 @@ define(function() {
   }
 
 };
-	});

src/commands/view/ImageComponent.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var InsertCustom = require('./InsertCustom');
-		/**
-		 * @class ImageComponent
-		 * @private
-		 * */
+
 module.exports = _.extend({}, InsertCustom, {
 
   /**
@@ -38,4 +33,3 @@ define(function(require, exports, module){
 
 
 });
-	});

src/commands/view/InsertCustom.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var CreateComponent = require('./CreateComponent');
-		/**
-		 * @class InsertCustom
-		 * @private
-		 * */
+
 module.exports = _.extend({}, CreateComponent, {
 
   init: function(){
@@ -82,4 +77,3 @@ define(function(require, exports, module){
     return this.opt.content || {};
   },
 });
-	});

src/commands/view/MoveComponent.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var SelectComponent = require('./SelectComponent');
 var SelectPosition = require('./SelectPosition');
@@ -148,4 +146,3 @@ define(function(require, exports, module){
     wp.css('cursor', '').unbind().removeClass(this.noSelClass);
   }
 });
-  });

src/commands/view/OpenAssets.js

@@ -1,6 +1,4 @@
-define(function() {
-
-  return {
+module.exports = {
 
   run: function(editor, sender, opts) {
     var opt = opts || {};
@@ -21,4 +19,3 @@ define(function() {
   },
 
 };
-});

src/commands/view/OpenBlocks.js

@@ -1,6 +1,4 @@
-define(function() {
-
-    return {
+module.exports = {
 
   run: function(editor, sender) {
     var config = editor.Config;
@@ -26,4 +24,3 @@ define(function() {
       this.blocks.style.display = 'none';
   }
 };
-  });

src/commands/view/OpenLayers.js

@@ -1,10 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Layers = require('Navigator');
-  /**
-   * @class OpenStyleManager
-   * @private
-   * */
+
 module.exports = {
 
   run: function(em, sender) {
@@ -37,4 +32,3 @@ define(function(require, exports, module){
       this.$layers.hide();
   }
 };
-});

src/commands/view/OpenStyleManager.js

@@ -1,10 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var StyleManager = require('StyleManager');
-		/**
-		 * @class OpenStyleManager
-		 * @private
-		 * */
+
 module.exports = {
 
   run: function(em, sender) {
@@ -81,4 +76,3 @@ define(function(require, exports, module){
       this.$header.hide();
   }
 };
-	});

src/commands/view/OpenTraitManager.js

@@ -1,6 +1,4 @@
-define(function() {
-
-    return {
+module.exports = {
 
   run: function(editor, sender) {
     var config = editor.Config;
@@ -30,4 +28,3 @@ define(function() {
       this.obj.style.display = 'none';
   }
 };
-  });

src/commands/view/Preview.js

@@ -1,6 +1,4 @@
-define(function() {
-
-		return {
+module.exports = {
 
   getPanels: function(editor){
     if(!this.panels)
@@ -65,4 +63,3 @@ define(function() {
     this.tglPointers(editor, 1);
   }
 };
-	});

src/commands/view/Resize.js

@@ -1,5 +1,4 @@
-define(function() {
-  return {
+module.exports = {
 
   run: function(editor, sender, opts) {
     var el = (opts && opts.el) || '';
@@ -29,4 +28,3 @@ define(function() {
   },
 
 };
-});

src/commands/view/SelectComponent.js

@@ -1,13 +1,8 @@
-define(function(require) {
-    /**
-     * @class SelectComponent
-     * @private
-     * */
 var ToolbarView = require('DomComponents/view/ToolbarView');
 var Toolbar = require('DomComponents/model/Toolbar');
 var key = require('keymaster');
 
-    return {
+module.exports = {
 
   init: function(o){
     _.bindAll(this, 'onHover', 'onOut', 'onClick', 'onKeyPress');
@@ -504,4 +499,3 @@ define(function(require) {
     this.em.off('change:selectedComponent', this.updateToolbar, this);
   }
 };
-});

src/commands/view/SelectPosition.js

@@ -1,6 +1,4 @@
-define(function() {
-
-    return {
+module.exports = {
 
   /**
    * Start select position event
@@ -100,4 +98,3 @@ define(function() {
     this.$wrapper.unbind();
   }
 };
-});

src/commands/view/ShowOffset.js

@@ -1,5 +1,4 @@
-define(function() {
-  return {
+module.exports = {
 
   getOffsetMethod: function(state) {
     var method = state || '';
@@ -146,4 +145,3 @@ define(function() {
   },
 
 };
-});

src/commands/view/SwitchVisibility.js

@@ -1,5 +1,4 @@
-define(function() {
-		return {
+module.exports = {
 
   run: function(ed) {
     ed.Canvas.getBody().className = this.ppfx + 'dashed';
@@ -10,4 +9,3 @@ define(function() {
   }
 
 };
-	});

src/commands/view/TextComponent.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var CreateComponent = require('./CreateComponent');
-		/**
-		 * @class TextComponent
-		 * @private
-		 * */
+
 module.exports = _.extend({}, CreateComponent, {
 
   /**
@@ -34,4 +29,3 @@ define(function(require, exports, module){
   },
 
 });
-	});

src/css_composer/config/config.js

@@ -1,5 +1,4 @@
-define(function () {
-	return {
+module.exports = {
 
   // Style prefix
   stylePrefix: 'css-',
@@ -11,4 +10,3 @@ define(function () {
   rules: [],
 
 };
-});

src/css_composer/index.js

@@ -21,8 +21,8 @@
  *    rules: '.myClass{ color: red}',
  * }
  */
-define(function(require) {
-  return function() {
+
+module.exports = function() {
   var c = {},
   defaults = require('./config/config'),
   CssRule = require('./model/CssRule'),
@@ -270,5 +270,3 @@ define(function(require) {
 
     };
 };
-
-});

src/css_composer/model/CssRule.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Selectors = require('./Selectors');
+
 module.exports = Backbone.Model.extend({
 
 	defaults: {
@@ -92,4 +91,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/css_composer/model/CssRules.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var CssRule = require('./CssRule');
+
 module.exports = Backbone.Collection.extend({
 
   initialize: function(models, opt){
@@ -33,4 +32,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/css_composer/model/Selectors.js

@@ -1,6 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
+
 module.exports = Backbone.Collection.extend({
 
   initialize: function(models, opt){
@@ -23,4 +22,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/css_composer/view/CssRuleView.js

@@ -1,6 +1,5 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
+
 module.exports = Backbone.View.extend({
 
   tagName: 'style',
@@ -76,4 +75,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/css_composer/view/CssRulesView.js

@@ -1,7 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var CssRuleView = require('./CssRuleView');
+
 module.exports = Backbone.View.extend({
 
   initialize: function(o) {
@@ -60,4 +59,3 @@ define(function(require, exports, module){
     return this;
   }
 });
-});

src/device_manager/config/config.js

@@ -1,9 +1,7 @@
-define(function () {
-	return {
+module.exports = {
 
   devices: [],
 
   deviceLabel: 'Device',
 
 };
-});

src/device_manager/index.js

@@ -11,9 +11,7 @@
  *
  * @module DeviceManager
  */
-define(function(require) {
-
-  return function() {
+module.exports = function() {
   var c = {},
   defaults = require('./config/config'),
   Devices = require('./model/Devices'),
@@ -111,5 +109,3 @@ define(function(require) {
   };
 
 };
-
-});

src/device_manager/model/Device.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
@@ -12,4 +10,3 @@ define(function(require, exports, module){
   },
 
 });
-  });

src/device_manager/view/DevicesView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var devicesTemplate = require('text!./../template/devices.html');
 
@@ -81,4 +79,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/config/config.js

@@ -1,5 +1,4 @@
-define(function () {
-	return {
+module.exports = {
   stylePrefix: 'comp-',
 
   wrapperId: 'wrapper',
@@ -29,4 +28,3 @@ define(function () {
   // List of void elements
   voidElements: ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'],
 };
-});

src/dom_components/index.js

@@ -32,9 +32,7 @@
  * }
  * ...
  */
-define(function(require) {
-
-  return function (){
+module.exports = function () {
   var c = {},
   componentTypes = {},
   defaults = require('./config/config'),
@@ -395,4 +393,3 @@ define(function(require) {
 
   };
 };
-});

src/dom_components/model/Component.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Components = require('./Components');
 var Selectors = require('SelectorManager/model/Selectors');
@@ -372,4 +370,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentImage.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -101,4 +99,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentLink.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./ComponentText');
 
 module.exports = Component.extend({
@@ -40,4 +38,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentMap.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./ComponentImage');
 var OComponent = require('./Component');
 
@@ -107,4 +105,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentScript.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -27,4 +25,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentTable.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -89,4 +87,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentTableCell.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -33,4 +31,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentTableRow.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -44,4 +42,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentText.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -11,4 +9,3 @@ define(function(require, exports, module){
   }),
 
 });
-});

src/dom_components/model/ComponentTextNode.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./Component');
 
 module.exports = Component.extend({
@@ -27,4 +25,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/ComponentVideo.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Component = require('./ComponentImage');
 var OComponent = require('./Component');
 
@@ -316,4 +314,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/Components.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Collection.extend({
@@ -78,4 +76,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/model/Toolbar.js

@@ -1,8 +1,4 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ToolbarButton = require('./ToolbarButton');
 
 module.exports = Backbone.Collection.extend({model: ToolbarButton});
-
-});

src/dom_components/model/ToolbarButton.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.Model.extend({
@@ -9,6 +7,4 @@ define(function(require, exports, module){
      attributes: {},
   },
 
-
-    });
 });

src/dom_components/view/ComponentImageView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentView');
 
@@ -71,4 +69,3 @@ define(function(require, exports, module){
     return this;
   },
 });
-});

src/dom_components/view/ComponentLinkView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentTextView');
 
@@ -20,4 +18,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentMapView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentImageView');
 
@@ -43,4 +41,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentScriptView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentImageView');
 
@@ -41,4 +39,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentTableCellView.js

@@ -1,8 +1,4 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentView');
 
-	module.exports = ComponentView.extend({
-	});
-});
+module.exports = ComponentView.extend({});

src/dom_components/view/ComponentTableRowView.js

@@ -1,8 +1,4 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentView');
 
-	module.exports = ComponentView.extend({
-	});
-});
+module.exports = ComponentView.extend({});

src/dom_components/view/ComponentTableView.js

@@ -1,11 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentView');
 
 module.exports = ComponentView.extend({
-
   events: {},
-		
-	});
 });

src/dom_components/view/ComponentTextNodeView.js

@@ -1,6 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({});
-});

src/dom_components/view/ComponentTextView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentView');
 
@@ -110,4 +108,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentVideoView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentView = require('./ComponentImageView');
 
@@ -118,4 +116,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var ComponentsView = require('./ComponentsView');
 
@@ -394,4 +392,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/dom_components/view/ComponentsView.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({
@@ -112,4 +110,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/dom_components/view/ToolbarButtonView.js

@@ -1,9 +1,6 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({
-
   events: {
     'mousedown': 'handleClick',
   },
@@ -35,4 +32,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/domain_abstract/ui/Input.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var inputTemplate = require('text!./templates/input.html');
 
@@ -82,4 +80,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/domain_abstract/ui/InputColor.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var Input = require('./Input');
 var Spectrum = require('Spectrum');
@@ -75,4 +73,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/domain_abstract/ui/InputNumber.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 var inputTemplate = require('text!./templates/inputNumber.html');
 
@@ -247,4 +245,3 @@ define(function(require, exports, module){
   }
 
 });
-});

src/domain_abstract/view/DomainViews.js

@@ -1,5 +1,3 @@
-define(function(require, exports, module){
-  'use strict';
 var Backbone = require('backbone');
 
 module.exports = Backbone.View.extend({
@@ -67,4 +65,3 @@ define(function(require, exports, module){
   },
 
 });
-});

src/editor/config/config.js

@@ -1,7 +1,5 @@
-define(function () {
 var blkStyle = '.blk-row::after{ content: ""; clear: both; display: block;} .blk-row{padding: 10px;}';
-  return {
-
+module.exports = {
   // Style prefix
   stylePrefix: 'gjs-',
 
@@ -292,4 +290,3 @@ define(function () {
   },
 
 };
-});

src/editor/index.js

@@ -68,9 +68,8 @@
  *   style: '.txt-red{color: red}',
  * });
  */
-define(function (require){
 
-    var Editor = function(config) {
+module.exports = function(config) {
   var c = config || {},
   defaults = require('./config/config'),
   EditorModel = require('./model/Editor'),
@@ -487,6 +486,3 @@ define(function (require){
   };
 
 };
-
-    return Editor;
-});