Merge branch 'release/3.0.4'

fusioncharts · Jul 16, 2019 · 7839126 · 7839126
2 parents 171f088 + ca164ed
commit 7839126
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 223 deletions.
diff --git a/component/index.js b/component/index.js
@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("fusioncharts"));
+		module.exports = factory();
 	else if(typeof define === 'function' && define.amd)
-		define(["fusioncharts"], factory);
+		define([], factory);
 	else if(typeof exports === 'object')
-		exports["VueFusionChartsComponent"] = factory(require("fusioncharts"));
+		exports["VueFusionChartsComponent"] = factory();
 	else
-		root["VueFusionChartsComponent"] = factory(root["FusionCharts"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_5__) {
+		root["VueFusionChartsComponent"] = factory();
+})(this, function() {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 6);
+/******/ 	return __webpack_require__(__webpack_require__.s = 5);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -544,7 +544,7 @@ exports.getOptions = getOptions;
 exports.renderChart = renderChart;
 exports.updateChart = updateChart;
 
-var _vue = __webpack_require__(9);
+var _vue = __webpack_require__(8);
 
 var _vue2 = _interopRequireDefault(_vue);
 
@@ -556,15 +556,13 @@ function makeNonreactive(obj) {
   obj.__ob__ = new Observer({});
 }
 
-var addDep = exports.addDep = function addDep(FC, _FC, modules) {
+var addDep = exports.addDep = function addDep(FC, modules) {
   if (FC) {
     if (modules.getName && modules.getType || modules.name && modules.type) {
       FC.addDep(modules);
     } else {
       modules(FC);
     }
-  } else {
-    modules(_FC);
   }
 };
 
@@ -17810,16 +17808,10 @@ function updateChart(This) {
   }
 }.call(this));
 
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(10)(module)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(9)(module)))
 
 /***/ }),
 /* 5 */
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_5__;
-
-/***/ }),
-/* 6 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -17831,14 +17823,8 @@ Object.defineProperty(exports, "__esModule", {
 
 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 _fusioncharts = __webpack_require__(5);
-
-var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
-
 var _utils = __webpack_require__(3);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _require = __webpack_require__(2),
     optionsMap = _require.optionsMap,
     props = _require.props;
@@ -17851,7 +17837,7 @@ exports.default = function (FC) {
   }
 
   options && options.forEach && options.forEach(function (modules) {
-    (0, _utils.addDep)(FC, _fusioncharts2.default, modules);
+    (0, _utils.addDep)(FC, modules);
   });
   return {
     name: 'fusioncharts',
@@ -18036,7 +18022,7 @@ exports.default = function (FC) {
 module.exports = exports['default'];
 
 /***/ }),
-/* 7 */
+/* 6 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(global, process) {(function (global, undefined) {
@@ -18229,7 +18215,7 @@ module.exports = exports['default'];
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
 
 /***/ }),
-/* 8 */
+/* 7 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(global) {var scope = (typeof global !== "undefined" && global) ||
@@ -18285,7 +18271,7 @@ exports._unrefActive = exports.active = function(item) {
 };
 
 // setimmediate attaches itself to the global object
-__webpack_require__(7);
+__webpack_require__(6);
 // On some exotic environments, it's not clear which object `setimmediate` was
 // able to install onto.  Search each possibility in the same order as the
 // `setimmediate` library.
@@ -18299,7 +18285,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
 
 /***/ }),
-/* 9 */
+/* 8 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26337,10 +26323,10 @@ if (inBrowser) {
 
 /* harmony default export */ __webpack_exports__["default"] = (Vue);
 
-/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(1), __webpack_require__(0), __webpack_require__(8).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(1), __webpack_require__(0), __webpack_require__(7).setImmediate))
 
 /***/ }),
-/* 10 */
+/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = function(module) {

diff --git a/component/index.js.map b/component/index.js.map
diff --git a/component/index.min.js b/component/index.min.js
diff --git a/dist/vue-fusioncharts.js b/dist/vue-fusioncharts.js
@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("fusioncharts"));
+		module.exports = factory();
 	else if(typeof define === 'function' && define.amd)
-		define(["fusioncharts"], factory);
+		define([], factory);
 	else if(typeof exports === 'object')
-		exports["VueFusionCharts"] = factory(require("fusioncharts"));
+		exports["VueFusionCharts"] = factory();
 	else
-		root["VueFusionCharts"] = factory(root["FusionCharts"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_11__) {
+		root["VueFusionCharts"] = factory();
+})(this, function() {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -306,14 +306,8 @@ Object.defineProperty(exports, "__esModule", {
 
 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 _fusioncharts = __webpack_require__(11);
-
-var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
-
 var _utils = __webpack_require__(5);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _require = __webpack_require__(3),
     optionsMap = _require.optionsMap,
     props = _require.props;
@@ -326,7 +320,7 @@ exports.default = function (FC) {
   }
 
   options && options.forEach && options.forEach(function (modules) {
-    (0, _utils.addDep)(FC, _fusioncharts2.default, modules);
+    (0, _utils.addDep)(FC, modules);
   });
   return {
     name: 'fusioncharts',
@@ -802,15 +796,13 @@ function makeNonreactive(obj) {
   obj.__ob__ = new Observer({});
 }
 
-var addDep = exports.addDep = function addDep(FC, _FC, modules) {
+var addDep = exports.addDep = function addDep(FC, modules) {
   if (FC) {
     if (modules.getName && modules.getType || modules.name && modules.type) {
       FC.addDep(modules);
     } else {
       modules(FC);
     }
-  } else {
-    modules(_FC);
   }
 };
 
@@ -26390,12 +26382,6 @@ module.exports = function(module) {
 };
 
 
-/***/ }),
-/* 11 */
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_11__;
-
 /***/ })
 /******/ ]);
 });

diff --git a/dist/vue-fusioncharts.js.map b/dist/vue-fusioncharts.js.map
diff --git a/dist/vue-fusioncharts.min.js b/dist/vue-fusioncharts.min.js
diff --git a/example/index.html b/example/index.html
@@ -21,9 +21,9 @@
       <fusioncharts
         :width="width"
         :height="height"
-        :type="type"
+        type="column2d"
         :dataFormat="dataFormat"
-        :dataSource="dataSource"
+        :dataSource="pieDataSource"
       >
         FusionCharts will render here...
       </fusioncharts>