Merge branch 'release/1.0.4'

rohitkr · rohitkr · commit 9c10cf856472 · 2017-01-10T16:43:36.000+05:30
diff --git a/dist/react-fusioncharts.js b/dist/react-fusioncharts.js
@@ -20,11 +20,9 @@ var _react = (typeof window !== "undefined" ? window['React'] : typeof global !=
 
 var _react2 = _interopRequireDefault(_react);
 
-var FusionCharts = typeof window !== 'undefined' ? window['FusionCharts'] : typeof global !== 'undefined' ? global['FusionCharts'] : null;
+var _fusioncharts = (typeof window !== "undefined" ? window['FusionCharts'] : typeof global !== "undefined" ? global['FusionCharts'] : null);
 
-if (typeof FusionCharts === 'undefined') {
-    FusionCharts = require('fusioncharts');
-}
+var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
 
 var ReactFC = (function (_React$Component) {
     _inherits(ReactFC, _React$Component);
@@ -43,7 +41,7 @@ var ReactFC = (function (_React$Component) {
         this.fcConfig = props;
         this.renderAt = propsObj.renderAt;
 
-        this.chartObj = new FusionCharts(this.fcConfig);
+        this.chartObj = new _fusioncharts2['default'](this.fcConfig);
 
         this.getRenderAt = function () {
             return _this.renderAt || _this.chartObj.id + '-container';
@@ -106,5 +104,5 @@ exports['default'] = ReactFC;
 module.exports = exports['default'];
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"fusioncharts":undefined}]},{},[1])(1)
+},{}]},{},[1])(1)
 });
diff --git a/dist/react-fusioncharts.min.js b/dist/react-fusioncharts.min.js
diff --git a/example/src/url-sample.html b/example/src/url-sample.html
@@ -1,14 +1,13 @@
 <!doctype html>
 <head>
 	<title>react-fc</title>
-	<link rel="stylesheet" href="example.css">
 </head>
 <body>
 	<div class="container">
-		<h1>react-fc</h1>
-		<h2><a href="https://github.com/rohitkr/react-fc">View project on GitHub</a></h2>
+		<h1>react-fusioncharts</h1>
+		<h3><a href="https://github.com/fusioncharts/react-fusioncharts-component">View project on GitHub</a></h3>
 		<!-- the example app is rendered into this div -->
-		<div id="app"></div>
+		<div id="app"> Loading chart... </div>
 		<div class="hint">
 			<!-- put any hints about your component example here -->
 		</div>
diff --git a/lib/ReactFC.js b/lib/ReactFC.js
@@ -18,11 +18,9 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var FusionCharts = typeof window !== 'undefined' ? window['FusionCharts'] : typeof global !== 'undefined' ? global['FusionCharts'] : null;
+var _fusioncharts = require('fusioncharts');
 
-if (typeof FusionCharts === 'undefined') {
-    FusionCharts = require('fusioncharts');
-}
+var _fusioncharts2 = _interopRequireDefault(_fusioncharts);
 
 var ReactFC = (function (_React$Component) {
     _inherits(ReactFC, _React$Component);
@@ -41,7 +39,7 @@ var ReactFC = (function (_React$Component) {
         this.fcConfig = props;
         this.renderAt = propsObj.renderAt;
 
-        this.chartObj = new FusionCharts(this.fcConfig);
+        this.chartObj = new _fusioncharts2['default'](this.fcConfig);
 
         this.getRenderAt = function () {
             return _this.renderAt || _this.chartObj.id + '-container';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-fusioncharts",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "React FusionCharts",
   "main": "lib/ReactFC.js",
   "author": "FusionCharts",
@@ -54,7 +54,8 @@
     "react": "^0.14.0"
   },
   "browserify-shim": {
-    "react": "global:React"
+    "react": "global:React",
+    "fusioncharts": "global:FusionCharts"
   },
   "scripts": {
     "build": "gulp clean && NODE_ENV=production gulp build",
diff --git a/src/ReactFC.js b/src/ReactFC.js
@@ -1,11 +1,5 @@
 import React from 'react';
-
-var FusionCharts = (typeof window !== 'undefined' ? window['FusionCharts'] :
-		typeof global !== 'undefined' ? global['FusionCharts'] : null);
-
-if (typeof FusionCharts === 'undefined') {
-	FusionCharts = require('fusioncharts');
-}
+import FusionCharts from 'fusioncharts';
 
 class ReactFC extends React.Component {
     constructor (props) {
