Skip to content

Commit d81560a

Browse files
rohanoid5rohanoid5
authored
Merge pull request #57 from fusioncharts/develop
Develop
2 parents 171f088 + 7904011 commit d81560a

11 files changed

+38
-223
lines changed

‎component/index.js

+16-30
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
(function webpackUniversalModuleDefinition(root, factory) {
22
if(typeof exports === 'object' && typeof module === 'object')
3-
module.exports = factory(require("fusioncharts"));
3+
module.exports = factory();
44
else if(typeof define === 'function' && define.amd)
5-
define(["fusioncharts"], factory);
5+
define([], factory);
66
else if(typeof exports === 'object')
7-
exports["VueFusionChartsComponent"] = factory(require("fusioncharts"));
7+
exports["VueFusionChartsComponent"] = factory();
88
else
9-
root["VueFusionChartsComponent"] = factory(root["FusionCharts"]);
10-
})(this, function(__WEBPACK_EXTERNAL_MODULE_5__) {
9+
root["VueFusionChartsComponent"] = factory();
10+
})(this, function() {
1111
return /******/ (function(modules) { // webpackBootstrap
1212
/******/ // The module cache
1313
/******/ var installedModules = {};
@@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap
7373
/******/ __webpack_require__.p = "";
7474
/******/
7575
/******/ // Load entry module and return exports
76-
/******/ return __webpack_require__(__webpack_require__.s = 6);
76+
/******/ return __webpack_require__(__webpack_require__.s = 5);
7777
/******/ })
7878
/************************************************************************/
7979
/******/ ([
@@ -544,7 +544,7 @@ exports.getOptions = getOptions;
544544
exports.renderChart = renderChart;
545545
exports.updateChart = updateChart;
546546

547-
var _vue = __webpack_require__(9);
547+
var _vue = __webpack_require__(8);
548548

549549
var _vue2 = _interopRequireDefault(_vue);
550550

@@ -556,15 +556,13 @@ function makeNonreactive(obj) {
556556
obj.__ob__ = new Observer({});
557557
}
558558

559-
var addDep = exports.addDep = function addDep(FC, _FC, modules) {
559+
var addDep = exports.addDep = function addDep(FC, modules) {
560560
if (FC) {
561561
if (modules.getName && modules.getType || modules.name && modules.type) {
562562
FC.addDep(modules);
563563
} else {
564564
modules(FC);
565565
}
566-
} else {
567-
modules(_FC);
568566
}
569567
};
570568

@@ -17810,16 +17808,10 @@ function updateChart(This) {
1781017808
}
1781117809
}.call(this));
1781217810

17813-
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(10)(module)))
17811+
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(9)(module)))
1781417812

1781517813
/***/ }),
1781617814
/* 5 */
17817-
/***/ (function(module, exports) {
17818-
17819-
module.exports = __WEBPACK_EXTERNAL_MODULE_5__;
17820-
17821-
/***/ }),
17822-
/* 6 */
1782317815
/***/ (function(module, exports, __webpack_require__) {
1782417816

1782517817
"use strict";
@@ -17831,14 +17823,8 @@ Object.defineProperty(exports, "__esModule", {
1783117823

1783217824
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; };
1783317825

17834-
var _fusioncharts = __webpack_require__(5);
17835-
17836-
var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
17837-
1783817826
var _utils = __webpack_require__(3);
1783917827

17840-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17841-
1784217828
var _require = __webpack_require__(2),
1784317829
optionsMap = _require.optionsMap,
1784417830
props = _require.props;
@@ -17851,7 +17837,7 @@ exports.default = function (FC) {
1785117837
}
1785217838

1785317839
options && options.forEach && options.forEach(function (modules) {
17854-
(0, _utils.addDep)(FC, _fusioncharts2.default, modules);
17840+
(0, _utils.addDep)(FC, modules);
1785517841
});
1785617842
return {
1785717843
name: 'fusioncharts',
@@ -18036,7 +18022,7 @@ exports.default = function (FC) {
1803618022
module.exports = exports['default'];
1803718023

1803818024
/***/ }),
18039-
/* 7 */
18025+
/* 6 */
1804018026
/***/ (function(module, exports, __webpack_require__) {
1804118027

1804218028
/* WEBPACK VAR INJECTION */(function(global, process) {(function (global, undefined) {
@@ -18229,7 +18215,7 @@ module.exports = exports['default'];
1822918215
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
1823018216

1823118217
/***/ }),
18232-
/* 8 */
18218+
/* 7 */
1823318219
/***/ (function(module, exports, __webpack_require__) {
1823418220

1823518221
/* WEBPACK VAR INJECTION */(function(global) {var scope = (typeof global !== "undefined" && global) ||
@@ -18285,7 +18271,7 @@ exports._unrefActive = exports.active = function(item) {
1828518271
};
1828618272

1828718273
// setimmediate attaches itself to the global object
18288-
__webpack_require__(7);
18274+
__webpack_require__(6);
1828918275
// On some exotic environments, it's not clear which object `setimmediate` was
1829018276
// able to install onto. Search each possibility in the same order as the
1829118277
// `setimmediate` library.
@@ -18299,7 +18285,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
1829918285
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
1830018286

1830118287
/***/ }),
18302-
/* 9 */
18288+
/* 8 */
1830318289
/***/ (function(module, __webpack_exports__, __webpack_require__) {
1830418290

1830518291
"use strict";
@@ -26337,10 +26323,10 @@ if (inBrowser) {
2633726323

2633826324
/* harmony default export */ __webpack_exports__["default"] = (Vue);
2633926325

26340-
/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(1), __webpack_require__(0), __webpack_require__(8).setImmediate))
26326+
/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(1), __webpack_require__(0), __webpack_require__(7).setImmediate))
2634126327

2634226328
/***/ }),
26343-
/* 10 */
26329+
/* 9 */
2634426330
/***/ (function(module, exports) {
2634526331

2634626332
module.exports = function(module) {

‎component/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎component/index.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-fusioncharts.js

+7-21
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
(function webpackUniversalModuleDefinition(root, factory) {
22
if(typeof exports === 'object' && typeof module === 'object')
3-
module.exports = factory(require("fusioncharts"));
3+
module.exports = factory();
44
else if(typeof define === 'function' && define.amd)
5-
define(["fusioncharts"], factory);
5+
define([], factory);
66
else if(typeof exports === 'object')
7-
exports["VueFusionCharts"] = factory(require("fusioncharts"));
7+
exports["VueFusionCharts"] = factory();
88
else
9-
root["VueFusionCharts"] = factory(root["FusionCharts"]);
10-
})(this, function(__WEBPACK_EXTERNAL_MODULE_11__) {
9+
root["VueFusionCharts"] = factory();
10+
})(this, function() {
1111
return /******/ (function(modules) { // webpackBootstrap
1212
/******/ // The module cache
1313
/******/ var installedModules = {};
@@ -306,14 +306,8 @@ Object.defineProperty(exports, "__esModule", {
306306

307307
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; };
308308

309-
var _fusioncharts = __webpack_require__(11);
310-
311-
var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
312-
313309
var _utils = __webpack_require__(5);
314310

315-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
316-
317311
var _require = __webpack_require__(3),
318312
optionsMap = _require.optionsMap,
319313
props = _require.props;
@@ -326,7 +320,7 @@ exports.default = function (FC) {
326320
}
327321

328322
options && options.forEach && options.forEach(function (modules) {
329-
(0, _utils.addDep)(FC, _fusioncharts2.default, modules);
323+
(0, _utils.addDep)(FC, modules);
330324
});
331325
return {
332326
name: 'fusioncharts',
@@ -802,15 +796,13 @@ function makeNonreactive(obj) {
802796
obj.__ob__ = new Observer({});
803797
}
804798

805-
var addDep = exports.addDep = function addDep(FC, _FC, modules) {
799+
var addDep = exports.addDep = function addDep(FC, modules) {
806800
if (FC) {
807801
if (modules.getName && modules.getType || modules.name && modules.type) {
808802
FC.addDep(modules);
809803
} else {
810804
modules(FC);
811805
}
812-
} else {
813-
modules(_FC);
814806
}
815807
};
816808

@@ -26390,12 +26382,6 @@ module.exports = function(module) {
2639026382
};
2639126383

2639226384

26393-
/***/ }),
26394-
/* 11 */
26395-
/***/ (function(module, exports) {
26396-
26397-
module.exports = __WEBPACK_EXTERNAL_MODULE_11__;
26398-
2639926385
/***/ })
2640026386
/******/ ]);
2640126387
});

‎dist/vue-fusioncharts.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-fusioncharts.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<fusioncharts
2222
:width="width"
2323
:height="height"
24-
:type="type"
24+
type="column2d"
2525
:dataFormat="dataFormat"
26-
:dataSource="dataSource"
26+
:dataSource="pieDataSource"
2727
>
2828
FusionCharts will render here...
2929
</fusioncharts>

0 commit comments

Comments
 (0)