Deprecated widgy.backbone.render

Author: zmetcalf

widgy/static/widgy/js/modal/modal.js

@@ -21,11 +21,15 @@ define([ 'jquery',
     },
 
     open: function() {
-      $(document.body).append(this.render().$el.css({
-        left: $(window).width()/2,
-        top: $(window).height()/2,
-        position: 'fixed'
-      }));
+      this.renderPromise().then(
+        $(document.body).append(
+          this.$el.css({
+            left: $(window).width()/2,
+            top: $(window).height()/2,
+            position: 'fixed'
+          })
+        )
+      );
     }
   });
 

widgy/static/widgy/js/nodes/base.js

@@ -46,13 +46,6 @@ define(['jquery', 'underscore', 'widgy.backbone', 'geometry'], function(
       this.parent = options.parent;
     },
 
-    render: function() {
-      Backbone.View.prototype.render.apply(this, arguments);
-      _.each(this.cssClasses(), this.$el.addClass, this.$el);
-
-      return this;
-    },
-
     renderPromise: function() {
       return Backbone.View.prototype.renderPromise.apply(this, arguments)
         .then(function(self) {

widgy/static/widgy/js/nodes/nodes.js

@@ -286,9 +286,13 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
       }
 
       if (this.canAcceptChild(view)) {
-        $children.prepend(this.createDropTarget(view).el);
+        this.createDropTarget(view).then(function(drop_target) {
+          $children.prepend(drop_target.el);
+        });
         this.list.each(function(node_view) {
-          var drop_target = that.createDropTarget(view).$el.insertAfter(node_view.el);
+          that.createDropTarget(view).then(function(that_drop_target) {
+            var drop_target = that_drop_target.$el.insertAfter(node_view.el);
+          })
         }, this);
         this.refreshDropTargetVisibility();
 
@@ -331,7 +335,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
         }
       }
 
-      return drop_target.render();
+      return drop_target.renderPromise();
     },
 
     clearDropTargets: function() {
@@ -442,11 +446,13 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
       // this must happen after shelf.$el is in the dom so fixto can
       // find the .node element
       if ( this.isRootNode() ) {
-        this.shelf.$el.fixTo('.node', {
-          // mezzanine header
-          mind: '#container > .breadcrumbs, #container > #header',
-          // XXX: move this to css
-          zIndex: 50
+        this.shelf.shelf_promise.then(function(shelf) {
+          shelf.$el.fixTo('.node', {
+            // mezzanine header
+            mind: '#container > .breadcrumbs, #container > #header',
+            // XXX: move this to css
+            zIndex: 50
+          });
         });
       }
     },
@@ -472,10 +478,15 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
 
       var shelf = this.shelf = this.makeShelf();
 
+      var children = this.$children;
+
       this.listenTo(shelf, 'startDrag', this.startDrag)
           .listenTo(shelf, 'stopDrag', this.stopDrag);
 
-      this.$children.before(shelf.render().el);
+      shelf.shelf_promise = shelf.renderPromise()
+      shelf.shelf_promise.then(function(rendered_shelf) {
+        children.before(rendered_shelf.el);
+      });
       return shelf;
     },
 

widgy/static/widgy/js/shelves/shelves.js

@@ -63,19 +63,24 @@ define([ 'jquery', 'underscore', 'widgy.backbone', 'nodes/base',
 
     },
 
-    render: function() {
-      Backbone.View.prototype.render.apply(this, arguments);
-      this.$scroll = this.$el.find('> .scroll');
-      var $list = this.$list = this.$scroll.find('> .list');
-      this.collection.on('sort', this.resort);
-
-      this.list.on('push', function(view) {
-        $list.append(view.render().el);
+    renderPromise: function() {
+      var promise = Backbone.View.prototype.renderPromise.apply(this, arguments);
+      promise.then(function(shelf) {
+        shelf.$scroll = shelf.$el.find('> .scroll');
+        var $list = shelf.$list = shelf.$scroll.find('> .list');
+
+        shelf.collection.on('sort', this.resort);
+
+        shelf.list.on('push', function(view) {
+          view.renderPromise().then(function(promise_view) {
+            $list.append(promise_view.el);
+          });
+        });
+
+        shelf.resizeShelf();
+        $(window).resize(shelf.resizeShelf);
       });
-
-      this.resizeShelf();
-      $(window).resize(this.resizeShelf);
-      return this;
+      return promise;
     },
 
     resizeShelf: function() {
@@ -176,10 +181,12 @@ define([ 'jquery', 'underscore', 'widgy.backbone', 'nodes/base',
       return this.model.get('css_classes');
     },
 
-    render: function() {
-      DraggableView.prototype.render.apply(this, arguments);
-      this.$el.attr('title', this.model.get('tooltip'));
-      return this;
+    renderPromise: function() {
+      var promise = DraggableView.prototype.renderPromise.apply(this, arguments);
+      promise.then(function(shelf_view) {
+        shelf_view.$el.attr('title', shelf_view.model.get('tooltip'));
+      });
+      return promise;
     }
 
   });

widgy/static/widgy/js/widgy.backbone.js

@@ -103,14 +103,7 @@ define([ 'jquery', 'underscore', 'backbone', 'lib/mustache', 'lib/q', 'geometry'
     },
 
     render: function() {
-      var context = this.toJSON(),
-          template = this.getTemplate();
-
-      if (template) {
-        this.$el.html(this.renderTemplate(template, context));
-      }
-
-      return this;
+      // Deprecated for renderPromise
     },
 
     renderPromise: function() {

widgy/static/widgy/js/widgy.js

@@ -50,15 +50,6 @@ define([ 'jquery', 'underscore', 'widgy.backbone', 'lib/csrf', 'lib/q', 'nodes/n
       });
     },
 
-    render: function() {
-      Backbone.View.prototype.render.apply(this, arguments);
-
-      this.$editor = this.$el.children('.editor');
-      this.$editor.append(this.root_node_view.render().el);
-
-      return this;
-    },
-
     renderPromise: function() {
       var compatibility_promise = this.fetchCompatibility();