s/image_format/format

IPython/html/static/notebook/js/widgets/widget_image.js

@@ -1,57 +1,57
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // ImageWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var ImageWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('ImageWidgetModel', ImageWidgetModel);
 
     var ImageView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render : function(){
             this.setElement($("<img />"));
             this.update(); // Set defaults.
         },
         
         update : function(){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            var image_src = 'data:image/' + this.model.get('image_format') + ';base64,' + this.model.get('_b64value');
+            var image_src = 'data:image/' + this.model.get('format') + ';base64,' + this.model.get('_b64value');
             this.$el.attr('src', image_src);
             
             var width = this.model.get('width');
             if (width !== undefined && width.length > 0) {
                 this.$el.attr('width', width);
             } else {
                 this.$el.removeAttr('width');
             }
             
             var height = this.model.get('height');
             if (height !== undefined && height.length > 0) {
                 this.$el.attr('height', height);
             } else {
                 this.$el.removeAttr('height');
             }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
     });
 
     widget_manager.register_widget_view('ImageView', ImageView);
 
 });

IPython/html/widgets/widget_image.py

@@ -1,38 +1,38
 """ButtonWidget class.  
 
 Represents a button in the frontend using a widget.  Allows user to listen for
 click events on the button and trigger backend code when the clicks are fired.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import base64
 
 from .widget import DOMWidget
 from IPython.utils.traitlets import Unicode, Bytes
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class ImageWidget(DOMWidget):
     target_name = Unicode('ImageWidgetModel')
     view_name = Unicode('ImageView')
     
     # Define the custom state properties to sync with the front-end
-    keys = ['image_format', 'width', 'height', '_b64value'] + DOMWidget.keys
-    image_format = Unicode('png')
+    keys = ['format', 'width', 'height', '_b64value'] + DOMWidget.keys
+    format = Unicode('png')
     width = Unicode()
     height = Unicode()
     _b64value = Unicode()
     
     value = Bytes()
     def _value_changed(self, name, old, new):
         self._b64value = base64.b64encode(new)
  No newline at end of file