rename canvasReady by chartReady

LearnBoost · Feb 22, 2011 · 948c6ee · 948c6ee
1 parent be29d6a
commit 948c6ee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/examples/express/public/js/main.js b/examples/express/public/js/main.js
@@ -17,11 +17,11 @@ $(document).ready(function(){
       myLocalChart.refresh();
     });
 
-    // canvasReady event
-    $(myLocalChart).bind('canvasReady', function(ev, data, renserv){
+    // chartReady event
+    $(myLocalChart).bind('chartReady', function(ev, data, renserv){
       $(this.el).append('<div class="msn">rendering ' + (renserv ? 'server' : 'client') + '</div>');
       $(this.el).find('.msn').fadeOut(800, function(){
-//        $(this).remove();
+        $(this).remove();
       })
     });
 
@@ -42,8 +42,8 @@ $(document).ready(function(){
     });
 
 
-    // canvasReady event
-    $(myRemoteChart).bind('canvasReady', function(ev, data, renserv){
+    // chartReady event
+    $(myRemoteChart).bind('chartReady', function(ev, data, renserv){
       $(this.el).append('<div class="msn">rendering ' + (renserv ? 'server' : 'client') + '</div>');
       $(this.el).find('.msn').fadeOut(800, function(){
         $(this).remove();

diff --git a/public/js/drawback.js b/public/js/drawback.js
@@ -26,7 +26,7 @@
       var _addAtt = function (att, str, objDraw) {
         return str + (str.search('&'+att)< 0 ? '&'+att + '='+ $(objDraw.el)[att]() : '')
       }
-        ,  _url = _addAtt('width', url, objDraw);
+        , _url = _addAtt('width', url, objDraw);
 
       _url = _addAtt('height', _url, objDraw);
       return _url;
@@ -96,7 +96,6 @@
         console.log ('ensure:');
         console.warn ('  Exists `' + draw_id + '.js`.');
         console.warn ('  Exists a registered method named `' + draw_id + '`.');
-
         return null;
       }
 
@@ -146,14 +145,12 @@
       img.src = _url + (refresh ? '&rnd='+(+new Date) : '');
 
       img.onload = function() {
-        $(objDraw.el).removeClass('loading');
-        $(objDraw.el).empty();
-        $(objDraw.el).append(img);
+        $(objDraw.el).removeClass('loading').empty().append(img);
 
         if(objDraw.options.onImgReady) objDraw.options.onImgReady(objDraw);
 
         // fireEvent canvasReady
-        $(objDraw).trigger('canvasReady', [objDraw, true]);
+        $(objDraw).trigger('chartReady', [objDraw, true]);
       }
 
     },
@@ -168,33 +165,34 @@
 
       // browser canvas support ?
       if(this.canvasSupport) {
-
-        // insert canvas response into element
-        $(objDraw.el).find('.'+cssClass).remove();
+        // refresh canvas response into element
         $(objDraw.el).addClass(cssClass);
 
         if(objDraw.options.autoInject) {
-          var canvas = objDraw.fn(data, objDraw.el);
-          $(objDraw.el).empty().append(canvas);
-          $(objDraw).trigger('chartReady', [objDraw.data]);
+          var canvas = objDraw.fn(data, objDraw.el)
+            , exC = $(objDraw.el).find('canvas');
+
+          // append/replace canvas object
+          if(exC.length) exC.replaceWith(canvas)
+          else $(objDraw.el).append(canvas);
         }
 
         // fireEvent canvasReady
-        $(objDraw).trigger('canvasReady', [objDraw.data, false]);
+        $(objDraw).trigger('chartReady', [objDraw.data, false]);
       }
       else {
         // if not canvas supported then make rendering in server side
         this.renderFallback(objDraw);
       }
-
+ 
       // whether to include a download button along with the . If set to true, it injects an element like this before the target element.
       if(objDraw.options.download) {
         var url = objDraw.options.urlBuilder ? objDraw.options.urlBuilder(objDraw.id, objDraw.url, false) : '/draw/' + objDraw.id + '?url=/getData&forceDownload=true'
-          ,  src = this._modUrl(url, objDraw);
+          , src = this._modUrl(url, objDraw);
 
         if(src.search(/forceDownload=/) < 0) src+= '&forceDownload=true';
 
-        objDraw.el.append($('<div class="download"><a title="download \'' + objDraw.id + '\'" href="' + src + '">download</a></div>'));
+        if(!$(objDraw.el).find('div.download').length) objDraw.el.append($('<div class="download"><a title="download \'' + objDraw.id + '\'" href="' + src + '">download</a></div>'));
       }
     }
   }