Merge branch 'master' into fix-plot-other-domain

Author: Kully

CHANGELOG.md

@@ -4,15 +4,37 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [1.12.10] - 2016-11-23
+## [1.12.10] - 2016-11-28
 ### Updated
 - `FF.create_violin` and `FF.create_scatterplotmatrix` now by default do not print subplot grid information in output
+- Removed alert that occured when downloading plot images offline. Please note: for higher resolution images and more export options, consider making requests to our image servers. See: `help(py.image)` for more details.
 
 ### Added
-- Plot configuration options for offline plots. See the list of [configuration options](https://github.com/Rikorose/plotly.py/blob/master/plotly/offline/offline.py#L189) and [examples](https://plot.ly/javascript/configuration-options/) for more information. 
+- Plot configuration options for offline plots. See the list of [configuration options](https://github.com/Rikorose/plotly.py/blob/master/plotly/offline/offline.py#L189) and [examples](https://plot.ly/javascript/configuration-options/) for more information.
 	- Please note that these configuration options are for offline plots ONLY. For configuration options when embedding online plots please see our [embed tutorial](http://help.plot.ly/embed-graphs-in-websites/#step-8-customize-the-iframe).
 - `colors.py` file which contains functions for manipulating and validating colors and arrays of colors
 - 'scale' param in `FF.create_trisurf` which now can set the interpolation on the colorscales
+- animations now work in offline mode. By running `plotly.offline.plot()` and `plotly.offline.iplot()` with a `fig` with `frames`, the resulting plot will cycle through the figures defined in `frames` either in the browser or in an ipython notebook respectively. Here's an example
+```
+import IPython.display
+from IPython.display import display, HTML
+from plotly.offline import download_plotlyjs, init_notebook_mode, plot, iplot
+init_notebook_mode(connected=True)
+
+figure_or_data = {'data': [{'x': [1, 2], 'y': [0, 1]}],
+                  'layout': {'xaxis': {'range': [0, 3], 'autorange': False},
+                             'yaxis': {'range': [0, 20], 'autorange': False},
+                  'title': 'First Title'},
+                  'frames': [{'data': [{'x': [1, 2], 'y': [5, 7]}]},
+                             {'data': [{'x': [-1, 3], 'y': [3, 9]}]},
+                             {'data': [{'x': [2, 2.6], 'y': [7, 5]}]},
+                             {'data': [{'x': [1.5, 3], 'y': [7.5, 4]}]},
+                             {'data': [{'x': [1, 2], 'y': [0, 1]}],
+                              'layout': {'title': 'End Title'}}]}
+iplot(figure_or_data)
+```
+More examples can be found at https://plot.ly/python/animations/.
+- Upcoming animations in online mode: use `plotly.plotly.create_animations()` and `plotly.plotly.icreate_animations()` which animate a figure with the `frames` argument.
 
 ### Fixed
 - Trisurf now uses correct `Plotly Colorscales` when called
@@ -26,7 +48,7 @@ c1 = Column([6, 6, 6, 5], 'column 1')
 c2 = Column(['a', 'b', 'c', 'd'], 'column 2')
 g = Grid([c1, c2])
 
-# Upload the grid 
+# Upload the grid
 py.grid_ops.upload(g, 'my-grid', auto_open=False)
 
 # Make a graph that with data that is referenced from that grid
@@ -40,17 +62,17 @@ Then, whenever you update the data in `'my-grid'`, the associated plot will upda
 - the colorbar in `.create_trisurf` now displays properly in `offline mode`.
 
 ### Updated
-- the colorbar in `.create_trisurf` now displays the appropriate max and min values on the ends of the bar which corresponding to the coloring metric of the figure 
+- the colorbar in `.create_trisurf` now displays the appropriate max and min values on the ends of the bar which corresponding to the coloring metric of the figure
 - `edges_color` is now a param in `.create_trisurf` which only takes `rgb` values at the moment
 
 ## [1.12.8] - 2016-08-18
 ### Fixed
-- Fixed color bug with trisurf plots where certain triangles were colored strangely. The coordinates of `rgb(...)` are now rounded to their nearest integer (using Python3 method of rounding), then placed in the color string to fix the issue.   
+- Fixed color bug with trisurf plots where certain triangles were colored strangely. The coordinates of `rgb(...)` are now rounded to their nearest integer (using Python3 method of rounding), then placed in the color string to fix the issue.
 
 ## [1.12.7] - 2016-08-17
 ### Fixed
 - Edited `plotly.min.js` due to issue using `iplot` to plot offline in Jupyter Notebooks
-	- Please note that `plotly.min.js` may be cached in your Jupyter Notebook. Therefore, if you continue to experience this issue after upgrading the Plotly package please open a new notebook or clear the cache to ensure the correct `plotly.min.js` is referenced. 
+	- Please note that `plotly.min.js` may be cached in your Jupyter Notebook. Therefore, if you continue to experience this issue after upgrading the Plotly package please open a new notebook or clear the cache to ensure the correct `plotly.min.js` is referenced.
 
 ## [1.12.6] - 2016-08-09
 ### Updated

plotly/offline/offline.py

@@ -71,25 +71,17 @@ def get_image_download_script(caller):
         raise ValueError('caller should only be one of `iplot` or `plot`')
 
     return(
-             ('<script>'
-              'function downloadimage(format, height, width,'
-              ' filename) {{'
-              'var p = document.getElementById(\'{plot_id}\');'
-              'Plotly.downloadImage(p, {{format: format, height: height, '
-              'width: width, filename: filename}});'
-              '}};' +
-              check_start +
-              'if(confirm(\'Do you want to save this image as '
-              '{filename}.{format}?\\n\\n'
-              'For higher resolution images and more export options, '
-              'consider making requests to our image servers. Type: '
-              'help(py.image) for more details.'
-              '\')) {{'
-              'downloadimage(\'{format}\', {height}, {width}, '
-              '\'{filename}\');}}' +
-              check_end +
-              '</script>'
-              )
+        ('<script>'
+         'function downloadimage(format, height, width,'
+         ' filename) {{'
+         'var p = document.getElementById(\'{plot_id}\');'
+         'Plotly.downloadImage(p, {{format: format, height: height, '
+         'width: width, filename: filename}});}};' +
+         check_start +
+         '{{downloadimage(\'{format}\', {height}, {width}, '
+         '\'{filename}\');}}' +
+         check_end +
+         '</script>')
     )
 
 
@@ -311,7 +303,9 @@ def iplot(figure_or_data, show_link=True, link_text='Export to plot.ly',
     image (default=None |'png' |'jpeg' |'svg' |'webp') -- This parameter sets
         the format of the image to be downloaded, if we choose to download an
         image. This parameter has a default value of None indicating that no
-        image should be downloaded.
+        image should be downloaded. Please note: for higher resolution images
+        and more export options, consider making requests to our image servers.
+        Type: `help(py.image)` for more details.
     filename (default='plot') -- Sets the name of the file your image
         will be saved to. The extension should not be included.
     image_height (default=600) -- Specifies the height of the image in `px`.
@@ -422,9 +416,11 @@ def plot(figure_or_data, show_link=True, link_text='Export to plot.ly',
     image (default=None |'png' |'jpeg' |'svg' |'webp') -- This parameter sets
         the format of the image to be downloaded, if we choose to download an
         image. This parameter has a default value of None indicating that no
-        image should be downloaded.
-    image_filename (default='plot_image') -- Sets the name of the file your image
-        will be saved to. The extension should not be included.
+        image should be downloaded. Please note: for higher resolution images
+        and more export options, consider making requests to our image servers.
+        Type: `help(py.image)` for more details.
+    image_filename (default='plot_image') -- Sets the name of the file your
+        image will be saved to. The extension should not be included.
     image_height (default=600) -- Specifies the height of the image in `px`.
     image_width (default=800) -- Specifies the width of the image in `px`.
     """