##// END OF EJS Templates
Merge pull request #13466 from ericpre/fix_missing_import...
Matthias Bussonnier -
r27449:9800157a merge
parent child Browse files
Show More
@@ -83,7 +83,7 b' def _display_mimetype(mimetype, objs, raw=False, metadata=None):'
83 83 if raw:
84 84 # turn list of pngdata into list of { 'image/png': pngdata }
85 85 objs = [ {mimetype: obj} for obj in objs ]
86 display(*objs, raw=raw, metadata=metadata, include=[mimetype])
86 display_functions.display(*objs, raw=raw, metadata=metadata, include=[mimetype])
87 87
88 88 #-----------------------------------------------------------------------------
89 89 # Main functions
@@ -517,10 +517,10 b' class ProgressBar(DisplayObject):'
517 517 self.html_width, self.total, self.progress)
518 518
519 519 def display(self):
520 display(self, display_id=self._display_id)
520 display_functions.display(self, display_id=self._display_id)
521 521
522 522 def update(self):
523 display(self, display_id=self._display_id, update=True)
523 display_functions.display(self, display_id=self._display_id, update=True)
524 524
525 525 @property
526 526 def progress(self):
@@ -694,7 +694,7 b' class GeoJSON(JSON):'
694 694 metadata = {
695 695 'application/geo+json': self.metadata
696 696 }
697 display(bundle, metadata=metadata, raw=True)
697 display_functions.display(bundle, metadata=metadata, raw=True)
698 698
699 699 class Javascript(TextDisplayObject):
700 700
General Comments 0
You need to be logged in to leave comments. Login now