From 53d552caad1c18c20ef89e374b4aa434870fb557 Mon Sep 17 00:00:00 2001 From: Michael Malone Date: Mon, 25 Apr 2016 22:23:37 +1200 Subject: [PATCH] v1.0.6 --- dist/amd/dragula.js | 9 ++++++++- dist/aurelia-dragula.js | 4 +++- dist/commonjs/dragula.js | 5 ++++- dist/es2015/dragula.js | 3 ++- dist/system/dragula.js | 11 +++++++++-- dist/temp/aurelia-dragula.js | 25 +++++++++++++++++++------ package.json | 2 +- 7 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dist/amd/dragula.js b/dist/amd/dragula.js index a9bd9b5..a382102 100644 --- a/dist/amd/dragula.js +++ b/dist/amd/dragula.js @@ -25,6 +25,12 @@ define(['exports', 'aurelia-dependency-injection', './touchy', './options', './u } } + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { + return typeof obj; + } : function (obj) { + return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; + }; + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); @@ -528,7 +534,8 @@ define(['exports', 'aurelia-dependency-injection', './touchy', './options', './u }; Dragula.prototype._isCopy = function _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + var isBoolean = typeof this.options.copy === 'boolean' || _typeof(this.options.copy) === 'object' && typeof this.options.copy.valueOf() === 'boolean'; + return isBoolean ? this.options.copy : this.options.copy(item, container); }; _createClass(Dragula, [{ diff --git a/dist/aurelia-dragula.js b/dist/aurelia-dragula.js index aea1fef..a50f45f 100644 --- a/dist/aurelia-dragula.js +++ b/dist/aurelia-dragula.js @@ -648,7 +648,9 @@ export class Dragula { } _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + let isBoolean = typeof this.options.copy === 'boolean' || + (typeof this.options.copy === 'object' && typeof this.options.copy.valueOf() === 'boolean'); + return isBoolean ? this.options.copy : this.options.copy(item, container); } } diff --git a/dist/commonjs/dragula.js b/dist/commonjs/dragula.js index a6ab990..6f8ccde 100644 --- a/dist/commonjs/dragula.js +++ b/dist/commonjs/dragula.js @@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", { }); exports.Dragula = undefined; +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); var _aureliaDependencyInjection = require('aurelia-dependency-injection'); @@ -504,7 +506,8 @@ var Dragula = exports.Dragula = function () { }; Dragula.prototype._isCopy = function _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + var isBoolean = typeof this.options.copy === 'boolean' || _typeof(this.options.copy) === 'object' && typeof this.options.copy.valueOf() === 'boolean'; + return isBoolean ? this.options.copy : this.options.copy(item, container); }; _createClass(Dragula, [{ diff --git a/dist/es2015/dragula.js b/dist/es2015/dragula.js index 50150ed..963a072 100644 --- a/dist/es2015/dragula.js +++ b/dist/es2015/dragula.js @@ -487,7 +487,8 @@ export let Dragula = class Dragula { } _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + let isBoolean = typeof this.options.copy === 'boolean' || typeof this.options.copy === 'object' && typeof this.options.copy.valueOf() === 'boolean'; + return isBoolean ? this.options.copy : this.options.copy(item, container); } }; \ No newline at end of file diff --git a/dist/system/dragula.js b/dist/system/dragula.js index 793e576..0da2eed 100644 --- a/dist/system/dragula.js +++ b/dist/system/dragula.js @@ -1,7 +1,7 @@ 'use strict'; System.register(['aurelia-dependency-injection', './touchy', './options', './util', './emitter', './classes'], function (_export, _context) { - var inject, Container, touchy, GLOBAL_OPTIONS, Options, Util, Emitter, classes, _createClass, MIN_TIME_BETWEEN_REDRAWS_MS, Dragula; + var inject, Container, touchy, GLOBAL_OPTIONS, Options, Util, Emitter, classes, _typeof, _createClass, MIN_TIME_BETWEEN_REDRAWS_MS, Dragula; function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { @@ -26,6 +26,12 @@ System.register(['aurelia-dependency-injection', './touchy', './options', './uti classes = _classes; }], execute: function () { + _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { + return typeof obj; + } : function (obj) { + return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; + }; + _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { @@ -523,7 +529,8 @@ System.register(['aurelia-dependency-injection', './touchy', './options', './uti }; Dragula.prototype._isCopy = function _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + var isBoolean = typeof this.options.copy === 'boolean' || _typeof(this.options.copy) === 'object' && typeof this.options.copy.valueOf() === 'boolean'; + return isBoolean ? this.options.copy : this.options.copy(item, container); }; _createClass(Dragula, [{ diff --git a/dist/temp/aurelia-dragula.js b/dist/temp/aurelia-dragula.js index e925dd1..68fac1e 100644 --- a/dist/temp/aurelia-dragula.js +++ b/dist/temp/aurelia-dragula.js @@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", { }); exports.Util = exports.Options = exports.DIRECTION = exports.GLOBAL_OPTIONS = exports.Emitter = exports.Dragula = exports.DragulaAndDrop = undefined; +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _class; @@ -147,12 +149,12 @@ var DragulaAndDrop = exports.DragulaAndDrop = (_dec = (0, _aureliaTemplating.bin DragulaAndDrop.prototype._setupOptions = function _setupOptions() { var result = { containers: this._getOption('containers'), - copy: this._getOption('copy'), - copySortSource: this._getOption('copySortSource'), - revertOnSpill: this._getOption('revertOnSpill'), - removeOnSpill: this._getOption('removeOnSpill'), + copy: this._convertToBooleanIfRequired(this._getOption('copy')), + copySortSource: this._convertToBooleanIfRequired(this._getOption('copySortSource')), + revertOnSpill: this._convertToBooleanIfRequired(this._getOption('revertOnSpill')), + removeOnSpill: this._convertToBooleanIfRequired(this._getOption('removeOnSpill')), direction: this._getOption('direction'), - ignoreInputTextSelection: this._getOption('ignoreInputTextSelection'), + ignoreInputTextSelection: this._convertToBooleanIfRequired(this._getOption('ignoreInputTextSelection')), mirrorContainer: this._getOption('mirrorContainer') }; return result; @@ -165,6 +167,16 @@ var DragulaAndDrop = exports.DragulaAndDrop = (_dec = (0, _aureliaTemplating.bin return this[option]; }; + DragulaAndDrop.prototype._convertToBooleanIfRequired = function _convertToBooleanIfRequired(option) { + if (typeof option === 'function') { + return option; + } + if (typeof option === 'string') { + return option.toLowerCase() === 'true'; + } + return new Boolean(option); + }; + return DragulaAndDrop; }()) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class) || _class); @@ -648,7 +660,8 @@ var Dragula = exports.Dragula = function () { }; Dragula.prototype._isCopy = function _isCopy(item, container) { - return typeof this.options.copy === 'boolean' ? this.options.copy : this.options.copy(item, container); + var isBoolean = typeof this.options.copy === 'boolean' || _typeof(this.options.copy) === 'object' && typeof this.options.copy.valueOf() === 'boolean'; + return isBoolean ? this.options.copy : this.options.copy(item, container); }; _createClass(Dragula, [{ diff --git a/package.json b/package.json index 5e80337..f230d84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-dragula", - "version": "1.0.5", + "version": "1.0.6", "description": "An aurelia compatible version of Dragula", "keywords": [ "aurelia",