fixed conflict

yankev · yankev · commit 31b5aa457029 · 2016-04-18T16:15:39.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.9.9] - 2016-04-15
+### Fixed
+- Fixed `require is not defined` issue when plotting offline outside of Ipython Notebooks.
+
+## [1.9.8] - 2016-04-14
+### Fixed
+- Error no longer results from a "Run All" cells when working in a Jupyter Notebook.
+
+### Updated
+- Updated plotly.min.js so offline is using plotly.js v1.9.0
+	- Added Ternary plots with support for scatter traces (trace type `scatterternary`, currently only available in offline mode)
+	- For comprehensive update list see the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
+
 ## [1.9.7] - 2016-04-04
 ### Fixed
 - Offline mode will no longer delete the Jupyter Notebook's require, requirejs, and define variables.
diff --git a/plotly/offline/offline.py b/plotly/offline/offline.py
@@ -73,7 +73,7 @@ def init_notebook_mode():
 
 
 def _plot_html(figure_or_data, show_link, link_text,
-               validate, default_width, default_height):
+               validate, default_width, default_height, global_requirejs):
 
     figure = tools.return_figure_from_figure_or_data(figure_or_data, validate)
 
@@ -121,15 +121,21 @@ def _plot_html(figure_or_data, show_link, link_text,
         layout=jlayout,
         config=jconfig)
 
+    optional_line1 = ('require(["plotly"], function(Plotly) {{ '
+                      if global_requirejs else '')
+    optional_line2 = '}});' if global_requirejs else ''
+
     plotly_html_div = (
         ''
         '<div id="{id}" style="height: {height}; width: {width};" '
         'class="plotly-graph-div">'
         '</div>'
-        '<script type="text/javascript">'
+        '<script type="text/javascript">' +
+        optional_line1 +
         'window.PLOTLYENV=window.PLOTLYENV || {{}};'
         'window.PLOTLYENV.BASE_URL="' + plotly_platform_url + '";'
-        '{script}'
+        '{script}' +
+        optional_line2 +
         '</script>'
         '').format(
         id=plotdivid, script=script,
@@ -187,7 +193,7 @@ def iplot(figure_or_data, show_link=True, link_text='Export to plot.ly',
 
     plot_html, plotdivid, width, height = _plot_html(
         figure_or_data, show_link, link_text, validate,
-        '100%', 525)
+        '100%', 525, global_requirejs=True)
 
     display(HTML(plot_html))
 
@@ -256,7 +262,7 @@ def plot(figure_or_data,
 
     plot_html, plotdivid, width, height = _plot_html(
         figure_or_data, show_link, link_text, validate,
-        '100%', '100%')
+        '100%', '100%', global_requirejs=False)
 
     resize_script = ''
     if width == '100%' or height == '100%':
diff --git a/plotly/offline/plotly.min.js b/plotly/offline/plotly.min.js
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -2340,7 +2340,7 @@ def create_distplot(hist_data, group_labels,
         BETA function that creates a distplot similar to seaborn.distplot
 
         The distplot can be composed of all or any combination of the following
-        3 components: (1) histogram, (2) curve: (a) kernal density estimation
+        3 components: (1) histogram, (2) curve: (a) kernel density estimation
         or (b) normal curve, and (3) rug plot. Additionally, multiple distplots
         (from multiple datasets) can be created in the same plot.
 
@@ -3404,7 +3404,7 @@ def make_hist(self):
 
     def make_kde(self):
         """
-        Makes the kernal density estimation(s) for create_distplot().
+        Makes the kernel density estimation(s) for create_distplot().
 
         This is called when curve_type = 'kde' in create_distplot().
 
diff --git a/plotly/version.py b/plotly/version.py
@@ -1,3 +1 @@
-__version__ = '1.9.7'
-
-
+__version__ = '1.9.9'

-Original file line number
+Diff line change
@@ @@ -1,3 +1 @@ @@
 -__version__ = '1.9.7'
+-
+-
 +__version__ = '1.9.9'