Merge pull request #475 from plotly/cdn-options

Allow for the option of a CDN in offline mode

Author: Kevin Yan

plotly/offline/offline.py

@@ -30,6 +30,8 @@
     _matplotlib_imported = False
 
 __PLOTLY_OFFLINE_INITIALIZED = False
+__PLOTLY_USE_CDN = False
+
 
 def download_plotlyjs(download_url):
     warnings.warn('''
@@ -46,7 +48,7 @@ def get_plotlyjs():
     return plotlyjs
 
 
-def init_notebook_mode():
+def init_notebook_mode(connected=False):
     """
     Initialize plotly.js in the browser if it hasn't been loaded into the DOM
     yet. This is an idempotent method and can and should be called from any
@@ -56,20 +58,40 @@ def init_notebook_mode():
         raise ImportError('`iplot` can only run inside an IPython Notebook.')
 
     global __PLOTLY_OFFLINE_INITIALIZED
-    # Inject plotly.js into the output cell
-    script_inject = (
-        ''
-        '<script type=\'text/javascript\'>'
-        'if(!window.Plotly){{'
-        'define(\'plotly\', function(require, exports, module) {{'
-        '{script}'
-        '}});'
-        'require([\'plotly\'], function(Plotly) {{'
-        'window.Plotly = Plotly;'
-        '}});'
-        '}}'
-        '</script>'
-        '').format(script=get_plotlyjs())
+    global __PLOTLY_USE_CDN
+
+    __PLOTLY_USE_CDN = connected
+
+    if connected:
+        # Inject plotly.js into the output cell
+        script_inject = (
+            ''
+            '<script>'
+            'requirejs.config({'
+            'paths: { '
+            '\'plotly\': [\'https://cdn.plot.ly/plotly-latest.min\']},'
+            '});'
+            'if(!window.Plotly) {{'
+            'require([\'plotly\'],'
+            'function(plotly) {window.Plotly=plotly;});'
+            '}}'
+            '</script>'
+            )
+    else:
+        # Inject plotly.js into the output cell
+        script_inject = (
+            ''
+            '<script type=\'text/javascript\'>'
+            'if(!window.Plotly){{'
+            'define(\'plotly\', function(require, exports, module) {{'
+            '{script}'
+            '}});'
+            'require([\'plotly\'], function(Plotly) {{'
+            'window.Plotly = Plotly;'
+            '}});'
+            '}}'
+            '</script>'
+            '').format(script=get_plotlyjs())
 
     display(HTML(script_inject))
     __PLOTLY_OFFLINE_INITIALIZED = True
@@ -126,7 +148,7 @@ def _plot_html(figure_or_data, show_link, link_text,
 
     optional_line1 = ('require(["plotly"], function(Plotly) {{ '
                       if global_requirejs else '')
-    optional_line2 = '}});' if global_requirejs else ''
+    optional_line2 = ('}});' if global_requirejs else '')
 
     plotly_html_div = (
         ''