fix 2 bugs

Author: david-hodgetts

public/editorController.js

@@ -71,7 +71,12 @@ define(['ui', 'net', 'evileval'], function(ui, net, evileval){
     };
 
     var updateWithCanvasAnim = function(canvasAnim){
+        if(currentCanvasAnim){
+            currentCanvasAnim.updateListener = null;
+        }
         currentCanvasAnim = canvasAnim;
+        currentCanvasAnim.updateListener = view.setEditorContent;
+        
         canvasAnim.getSourceCodeString().then(function(codeString){
             view.setEditorContent(canvasAnim.animationName, codeString);
         });

public/exquis.js

@@ -30,6 +30,7 @@ define(["iter2d", "csshelper", "evileval", "net", "ui"], function(iter2d, csshel
 
     var makeCanvasAnimation = function(context){
         return {
+            updateListener:null,
             currentCode: null,
             context: context, //might be useful to debug
             borders : function(){
@@ -81,6 +82,7 @@ define(["iter2d", "csshelper", "evileval", "net", "ui"], function(iter2d, csshel
             },
 
             getSourceCodeString: function(){
+                //TODO continue refactoring here, see doc.org
                 if (this.uri.match(/^data:/)){
                     // the code is in the cache
                     return new Promise(function(resolve, reject){
@@ -157,9 +159,19 @@ define(["iter2d", "csshelper", "evileval", "net", "ui"], function(iter2d, csshel
                 var names = fileUris.map(store.uriToAnimationName);
                 return ui.populateNamePicker("choose animation", names);
             }).then(function(animationName){
-                var fileUri = store.animationNameToUri(animationName);
-                evileval.loadJsAnimOnCanvasAnim(fileUri, canvasAnim, animationName);
-                //TODO notify or update the editor to fix the BUG
+                if (animationName){
+                    var fileUri = store.animationNameToUri(animationName);
+                    return evileval.loadJsAnimOnCanvasAnim(fileUri, canvasAnim, animationName);
+                }else{
+                    throw "no animation name";
+                }
+            }).then(function(canvasAnim){ return canvasAnim.getSourceCodeString();
+            }).then(function(codeString){
+                if(canvasAnim.updateListener){
+                    canvasAnim.updateListener(canvasAnim.animationName, codeString);
+                }
+            }).catch(function(e){
+                console.log(e);
             });
 
         });

todo.org

@@ -13,6 +13,10 @@ par exemple en mettant les boutons de l'animation à coté de son nom, ou les me
 ** remplacer setInterval par requestAnimation
 * new animations
 * bugs
+** TODO animation name is displayed incorectly the second time you click on edit cell button
+net.extractAnimationNameFromUri cannot deduce the name from a data uri
+this problem will be solved when we introduce the distinction between canvasAnim.originalUrl and .codeUri 
+
 * implement blockly interface https://code.google.com/p/blockly/
 * allow usage of files from external urls (github.com, pastebin, etc)
 define a assemblage file with urls