Finish to review README and code for JSPM.

froala · Jul 7, 2017 · f759d44 · f759d44
1 parent 8e87f54
commit f759d44
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 82 deletions.
diff --git a/README.md b/README.md
@@ -285,6 +285,7 @@ jspm install -y
 
 ```bash
 jspm install aurelia-froala-editor
+jspm install npm:froala-editor -o "{format: 'global'}"
 ```
 
 - In your `src/main.js` or `src/main.ts` file add:
@@ -311,24 +312,6 @@ aurelia.use.plugin('aurelia-froala-editor');
 <froala-editor></froala-editor>
 ```
 
-- In `package.json` file add the following overrides to the `jspm` entry:
-
-```json
-"overrides": {
-  "npm:froala-editor@^2.6.0": {
-    "main": "js/froala-editor.min",
-    "format": "global",
-    "shim": {
-      "js/froala-editor.min": {
-        "deps": [
-          "jquery"
-        ]
-      }
-    }
-  }
-}
-```
-
 - In `build/bundles.js` add `aurelia-froala-editor` to `dist/aurelia` bundles:
 
 ```javascript

diff --git a/config.js b/config.js
@@ -4,9 +4,7 @@ System.config({
   babelOptions: {
     "optional": [
       "runtime",
-      "optimisation.modules.system",
-      "es7.decorators",
-      "es7.classProperties"
+      "optimisation.modules.system"
     ]
   },
   paths: {
@@ -16,12 +14,10 @@ System.config({
 
   map: {
     "aurelia-binding": "npm:[email protected]",
-    "aurelia-polyfills": "npm:[email protected]",
-    "aurelia-templating-resources": "npm:[email protected]",
+    "aurelia-dependency-injection": "npm:[email protected]",
     "babel": "npm:[email protected]",
     "babel-runtime": "npm:[email protected]",
     "core-js": "npm:[email protected]",
-    "froala-editor": "npm:[email protected]",
     "systemjs/plugin-css": "github:systemjs/[email protected]",
     "github:jspm/[email protected]": {
       "assert": "npm:[email protected]"
@@ -57,40 +53,12 @@ System.config({
       "aurelia-metadata": "npm:[email protected]",
       "aurelia-pal": "npm:[email protected]"
     },
-    "npm:[email protected]": {
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]"
-    },
     "npm:[email protected]": {
       "aurelia-pal": "npm:[email protected]"
     },
-    "npm:[email protected]": {
-      "aurelia-pal": "npm:[email protected]"
-    },
     "npm:[email protected]": {
       "aurelia-pal": "npm:[email protected]"
     },
-    "npm:[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-loader": "npm:[email protected]",
-      "aurelia-logging": "npm:[email protected]",
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]",
-      "aurelia-templating": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-loader": "npm:[email protected]",
-      "aurelia-logging": "npm:[email protected]",
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]"
-    },
     "npm:[email protected]": {
       "process": "github:jspm/[email protected]"
     },
@@ -104,13 +72,6 @@ System.config({
       "process": "github:jspm/[email protected]",
       "systemjs-json": "github:systemjs/[email protected]"
     },
-    "npm:[email protected]": {
-      "css": "github:systemjs/[email protected]"
-    },
-    "npm:[email protected]": {
-      "font-awesome": "npm:[email protected]",
-      "jquery": "npm:[email protected]"
-    },
     "npm:[email protected]": {
       "util": "github:jspm/[email protected]"
     },

diff --git a/dist/amd/froala-editor.js b/dist/amd/froala-editor.js
@@ -1,4 +1,4 @@
-define(['exports', 'aurelia-framework', 'aurelia-binding', 'aurelia-event-aggregator', './froala-editor-config'], function (exports, _aureliaFramework, _aureliaBinding, _aureliaEventAggregator, _froalaEditorConfig) {
+define(['exports', 'aurelia-framework', 'aurelia-binding', './froala-editor-config'], function (exports, _aureliaFramework, _aureliaBinding, _froalaEditorConfig) {
 	'use strict';
 
 	Object.defineProperty(exports, "__esModule", {
@@ -57,8 +57,8 @@ define(['exports', 'aurelia-framework', 'aurelia-binding', 'aurelia-event-aggreg
 
 	var _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3;
 
-	var FroalaEditor = exports.FroalaEditor = (_dec = (0, _aureliaFramework.customElement)('froala-editor'), _dec2 = (0, _aureliaFramework.inject)(Element, _froalaEditorConfig.Config, _aureliaBinding.ObserverLocator, _aureliaEventAggregator.EventAggregator), _dec(_class = _dec2(_class = (_class2 = function () {
-		function FroalaEditor(element, config, observerLocator, eventAggregator) {
+	var FroalaEditor = exports.FroalaEditor = (_dec = (0, _aureliaFramework.customElement)('froala-editor'), _dec2 = (0, _aureliaFramework.inject)(Element, _froalaEditorConfig.Config, _aureliaBinding.ObserverLocator), _dec(_class = _dec2(_class = (_class2 = function () {
+		function FroalaEditor(element, config, observerLocator) {
 			var _this = this;
 
 			_classCallCheck(this, FroalaEditor);

diff --git a/dist/commonjs/froala-editor.js b/dist/commonjs/froala-editor.js
@@ -11,8 +11,6 @@ var _aureliaFramework = require('aurelia-framework');
 
 var _aureliaBinding = require('aurelia-binding');
 
-var _aureliaEventAggregator = require('aurelia-event-aggregator');
-
 var _froalaEditorConfig = require('./froala-editor-config');
 
 function _initDefineProp(target, property, descriptor, context) {
@@ -60,8 +58,8 @@ function _initializerWarningHelper(descriptor, context) {
 	throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
 }
 
-var FroalaEditor = exports.FroalaEditor = (_dec = (0, _aureliaFramework.customElement)('froala-editor'), _dec2 = (0, _aureliaFramework.inject)(Element, _froalaEditorConfig.Config, _aureliaBinding.ObserverLocator, _aureliaEventAggregator.EventAggregator), _dec(_class = _dec2(_class = (_class2 = function () {
-	function FroalaEditor(element, config, observerLocator, eventAggregator) {
+var FroalaEditor = exports.FroalaEditor = (_dec = (0, _aureliaFramework.customElement)('froala-editor'), _dec2 = (0, _aureliaFramework.inject)(Element, _froalaEditorConfig.Config, _aureliaBinding.ObserverLocator), _dec(_class = _dec2(_class = (_class2 = function () {
+	function FroalaEditor(element, config, observerLocator) {
 		var _this = this;
 
 		_classCallCheck(this, FroalaEditor);

diff --git a/dist/es2015/froala-editor.js b/dist/es2015/froala-editor.js
@@ -45,13 +45,12 @@ function _initializerWarningHelper(descriptor, context) {
 
 import { inject, customElement, bindable } from 'aurelia-framework';
 import { ObserverLocator } from "aurelia-binding";
-import { EventAggregator } from 'aurelia-event-aggregator';
 
 import { Config } from './froala-editor-config';
 
-export let FroalaEditor = (_dec = customElement('froala-editor'), _dec2 = inject(Element, Config, ObserverLocator, EventAggregator), _dec(_class = _dec2(_class = (_class2 = class FroalaEditor {
+export let FroalaEditor = (_dec = customElement('froala-editor'), _dec2 = inject(Element, Config, ObserverLocator), _dec(_class = _dec2(_class = (_class2 = class FroalaEditor {
 
-	constructor(element, config, observerLocator, eventAggregator) {
+	constructor(element, config, observerLocator) {
 		_initDefineProp(this, 'value', _descriptor, this);
 
 		_initDefineProp(this, 'config', _descriptor2, this);

diff --git a/dist/system/froala-editor.js b/dist/system/froala-editor.js
@@ -1,9 +1,9 @@
 'use strict';
 
-System.register(['aurelia-framework', 'aurelia-binding', 'aurelia-event-aggregator', './froala-editor-config'], function (_export, _context) {
+System.register(['aurelia-framework', 'aurelia-binding', './froala-editor-config'], function (_export, _context) {
 	"use strict";
 
-	var inject, customElement, bindable, ObserverLocator, EventAggregator, Config, _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, FroalaEditor;
+	var inject, customElement, bindable, ObserverLocator, Config, _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, FroalaEditor;
 
 	function _initDefineProp(target, property, descriptor, context) {
 		if (!descriptor) return;
@@ -61,14 +61,12 @@ System.register(['aurelia-framework', 'aurelia-binding', 'aurelia-event-aggregat
 			bindable = _aureliaFramework.bindable;
 		}, function (_aureliaBinding) {
 			ObserverLocator = _aureliaBinding.ObserverLocator;
-		}, function (_aureliaEventAggregator) {
-			EventAggregator = _aureliaEventAggregator.EventAggregator;
 		}, function (_froalaEditorConfig) {
 			Config = _froalaEditorConfig.Config;
 		}],
 		execute: function () {
-			_export('FroalaEditor', FroalaEditor = (_dec = customElement('froala-editor'), _dec2 = inject(Element, Config, ObserverLocator, EventAggregator), _dec(_class = _dec2(_class = (_class2 = function () {
-				function FroalaEditor(element, config, observerLocator, eventAggregator) {
+			_export('FroalaEditor', FroalaEditor = (_dec = customElement('froala-editor'), _dec2 = inject(Element, Config, ObserverLocator), _dec(_class = _dec2(_class = (_class2 = function () {
+				function FroalaEditor(element, config, observerLocator) {
 					var _this = this;
 
 					_classCallCheck(this, FroalaEditor);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-froala-editor",
-  "version": "2.7.2_3",
+  "version": "2.7.3",
   "description": "Aurelia plugin for Froala WYSIWYG HTML rich text editor.",
   "keywords": [
     "aurelia",
@@ -58,18 +58,18 @@
   },
   "dependencies": {
     "froala-editor": "^2.6.0",
-    "aurelia-binding": "1.0.0",
+    "aurelia-binding": "^1.0.0",
     "aurelia-dependency-injection": "^1.0.0"
   },
   "jspm": {
+    "jspmNodeConversion": false,
     "main": "index",
     "directories": {
       "lib": "dist/system"
     },
     "dependencies": {
       "aurelia-binding": "npm:aurelia-binding@^1.2.1",
-      "aurelia-templating-resources": "npm:aurelia-templating-resources@^1.4.0",
-      "froala-editor": "npm:froala-editor@^2.6.2",
+      "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.3.1",
       "systemjs/plugin-css": "github:systemjs/plugin-css@^0.1.35"
     },
     "devDependencies": {

diff --git a/src/froala-editor.js b/src/froala-editor.js
@@ -1,11 +1,10 @@
 import {inject, customElement, bindable} from 'aurelia-framework';
 import {ObserverLocator} from "aurelia-binding";
-import {EventAggregator} from 'aurelia-event-aggregator';
 
 import {Config} from './froala-editor-config';
 
 @customElement('froala-editor')
-@inject(Element, Config, ObserverLocator, EventAggregator)
+@inject(Element, Config, ObserverLocator)
 export class FroalaEditor {
 	@bindable value;
 	@bindable config = {}
@@ -14,7 +13,7 @@ export class FroalaEditor {
 	element;
 	instance;
 
-	constructor (element, config, observerLocator, eventAggregator) {
+	constructor (element, config, observerLocator) {
     // Store element.
 		this.element = element;