...dataset не работает в сафари

Katochimoto · Nov 15, 2016 · 3f95491 · 3f95491
1 parent a7b466d
commit 3f95491
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 56 deletions.
diff --git a/dist/x-bubbles-compact.js b/dist/x-bubbles-compact.js
@@ -51,25 +51,23 @@ var XBubbles =
 
 	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 	var context = __webpack_require__(1);
 	var drag = __webpack_require__(2);
 	var editor = __webpack_require__(19);
 	var bubble = __webpack_require__(5);
 	var bubbleset = __webpack_require__(7);
 
 	var OPTIONS = {
-	    begining: ['noop', null],
-	    bubbleCopy: ['funk', bubbleCopyOption],
-	    bubbleDeformation: ['funk', function () {}],
-	    bubbleFormation: ['funk', function () {}],
-	    checkBubblePaste: ['funk', checkBubblePasteOption],
-	    classBubble: ['noop', 'bubble'],
-	    disableControls: ['bool', false],
-	    draggable: ['bool', true],
-	    ending: ['noop', null], // /\@ya\.ru/g;
-	    separator: ['noop', /[,;]/]
+	    begining: ['noop', null, 'begining'],
+	    bubbleCopy: ['funk', bubbleCopyOption, 'bubble-copy'],
+	    bubbleDeformation: ['funk', function () {}, 'bubble-deformation'],
+	    bubbleFormation: ['funk', function () {}, 'bubble-formation'],
+	    checkBubblePaste: ['funk', checkBubblePasteOption, 'check-bubble-paste'],
+	    classBubble: ['noop', 'bubble', 'class-bubble'],
+	    disableControls: ['bool', false, 'disable-controls'],
+	    draggable: ['bool', true, 'draggable'],
+	    ending: ['noop', null, 'ending'], // /\@ya\.ru/g;
+	    separator: ['noop', /[,;]/, 'separator']
 	};
 
 	var XBubbles = Object.create(HTMLDivElement.prototype, {
@@ -103,10 +101,17 @@ var XBubbles =
 	    options: {
 	        value: function value(name, _value) {
 	            if (!this._options) {
-	                this._options = _extends({}, Object.keys(OPTIONS).reduce(function (result, item) {
+	                this._options = Object.keys(OPTIONS).reduce(function (result, item) {
 	                    result[item] = undefined;
 	                    return result;
-	                }, {}), this.dataset);
+	                }, {});
+
+	                for (var optionName in OPTIONS) {
+	                    var attrName = 'data-' + OPTIONS[optionName][2];
+	                    if (this.hasAttribute(attrName)) {
+	                        this._options[optionName] = this.getAttribute(attrName);
+	                    }
+	                }
 
 	                optionsPrepare(this._options);
 	            }

diff --git a/dist/x-bubbles-compact.min.js b/dist/x-bubbles-compact.min.js
diff --git a/dist/x-bubbles-compact.min.js.map b/dist/x-bubbles-compact.min.js.map
diff --git a/dist/x-bubbles.js b/dist/x-bubbles.js
@@ -51,25 +51,23 @@ var XBubbles =
 
 	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 	var context = __webpack_require__(1);
 	var drag = __webpack_require__(2);
 	var editor = __webpack_require__(19);
 	var bubble = __webpack_require__(5);
 	var bubbleset = __webpack_require__(7);
 
 	var OPTIONS = {
-	    begining: ['noop', null],
-	    bubbleCopy: ['funk', bubbleCopyOption],
-	    bubbleDeformation: ['funk', function () {}],
-	    bubbleFormation: ['funk', function () {}],
-	    checkBubblePaste: ['funk', checkBubblePasteOption],
-	    classBubble: ['noop', 'bubble'],
-	    disableControls: ['bool', false],
-	    draggable: ['bool', true],
-	    ending: ['noop', null], // /\@ya\.ru/g;
-	    separator: ['noop', /[,;]/]
+	    begining: ['noop', null, 'begining'],
+	    bubbleCopy: ['funk', bubbleCopyOption, 'bubble-copy'],
+	    bubbleDeformation: ['funk', function () {}, 'bubble-deformation'],
+	    bubbleFormation: ['funk', function () {}, 'bubble-formation'],
+	    checkBubblePaste: ['funk', checkBubblePasteOption, 'check-bubble-paste'],
+	    classBubble: ['noop', 'bubble', 'class-bubble'],
+	    disableControls: ['bool', false, 'disable-controls'],
+	    draggable: ['bool', true, 'draggable'],
+	    ending: ['noop', null, 'ending'], // /\@ya\.ru/g;
+	    separator: ['noop', /[,;]/, 'separator']
 	};
 
 	var XBubbles = Object.create(HTMLDivElement.prototype, {
@@ -103,10 +101,17 @@ var XBubbles =
 	    options: {
 	        value: function value(name, _value) {
 	            if (!this._options) {
-	                this._options = _extends({}, Object.keys(OPTIONS).reduce(function (result, item) {
+	                this._options = Object.keys(OPTIONS).reduce(function (result, item) {
 	                    result[item] = undefined;
 	                    return result;
-	                }, {}), this.dataset);
+	                }, {});
+
+	                for (var optionName in OPTIONS) {
+	                    var attrName = 'data-' + OPTIONS[optionName][2];
+	                    if (this.hasAttribute(attrName)) {
+	                        this._options[optionName] = this.getAttribute(attrName);
+	                    }
+	                }
 
 	                optionsPrepare(this._options);
 	            }

diff --git a/dist/x-bubbles.min.js b/dist/x-bubbles.min.js
diff --git a/dist/x-bubbles.min.js.map b/dist/x-bubbles.min.js.map
diff --git a/docs/x-bubbles.min.js b/docs/x-bubbles.min.js
diff --git a/docs/x-bubbles.min.js.map b/docs/x-bubbles.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "x-bubbles",
   "description": "Bubbles",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "keywords": [],
   "homepage": "https://github.com/Katochimoto/x-bubbles",
   "author": {

diff --git a/src/index.js b/src/index.js
@@ -5,16 +5,16 @@ const bubble = require('./core/bubble');
 const bubbleset = require('./core/bubbleset');
 
 const OPTIONS = {
-    begining:           [ 'noop', null ],
-    bubbleCopy:         [ 'funk', bubbleCopyOption ],
-    bubbleDeformation:  [ 'funk', function () {} ],
-    bubbleFormation:    [ 'funk', function () {} ],
-    checkBubblePaste:   [ 'funk', checkBubblePasteOption ],
-    classBubble:        [ 'noop', 'bubble' ],
-    disableControls:    [ 'bool', false ],
-    draggable:          [ 'bool', true ],
-    ending:             [ 'noop', null ], // /\@ya\.ru/g;
-    separator:          [ 'noop', /[,;]/ ],
+    begining:           [ 'noop', null, 'begining' ],
+    bubbleCopy:         [ 'funk', bubbleCopyOption, 'bubble-copy' ],
+    bubbleDeformation:  [ 'funk', function () {}, 'bubble-deformation' ],
+    bubbleFormation:    [ 'funk', function () {}, 'bubble-formation' ],
+    checkBubblePaste:   [ 'funk', checkBubblePasteOption, 'check-bubble-paste' ],
+    classBubble:        [ 'noop', 'bubble', 'class-bubble' ],
+    disableControls:    [ 'bool', false, 'disable-controls' ],
+    draggable:          [ 'bool', true, 'draggable' ],
+    ending:             [ 'noop', null, 'ending' ], // /\@ya\.ru/g;
+    separator:          [ 'noop', /[,;]/, 'separator' ],
 };
 
 const XBubbles = Object.create(HTMLDivElement.prototype, {
@@ -48,14 +48,17 @@ const XBubbles = Object.create(HTMLDivElement.prototype, {
     options: {
         value: function (name, value) {
             if (!this._options) {
-                this._options = {
-                    ...Object.keys(OPTIONS).reduce(function (result, item) {
-                        result[ item ] = undefined;
-                        return result;
-                    }, {}),
-
-                    ...this.dataset
-                };
+                this._options = Object.keys(OPTIONS).reduce(function (result, item) {
+                    result[ item ] = undefined;
+                    return result;
+                }, {});
+
+                for (const optionName in OPTIONS) {
+                    const attrName = `data-${OPTIONS[ optionName ][2]}`;
+                    if (this.hasAttribute(attrName)) {
+                        this._options[ optionName ] = this.getAttribute(attrName);
+                    }
+                }
 
                 optionsPrepare(this._options);
             }