Merge branch 'master' of github.com:mozilla/napkin

export/index.js

@@ -377,12 +377,26 @@ function renderEjsTemplate(template, attributes, screensById) {
   template = template.replace(
     /\/share\/#\{session.sharedId\}\/project\/#\{projectId\}\/screen\/#\{screenId\}/g, '');
 
+  /* Replaces a screen id with its corresponding title slug. Returns a function
+   * that should be used as a regular expression replace callback.
+   * Requires: format for the replacement string, where %s will be replaced
+   *  with the slug
+   * Returns: regular expression replace callback assuming that the first
+   *  capture group is the screen id
+   */
+  function replaceLink(format) {
+    return function(match, screenId) {
+      screenId = parseInt(screenId, 10);
+      return format.replace(/%s/g, screensById[screenId].titleSlug);
+    };
+  }
+
   // screen link targets need to be translated to screen routes
   template = template.replace(/\/share\/#\{userId\}\/project\/#\{projectId\}\/screen\/(\d+)/g,
-    function(match, screenId) {
-      screenId = parseInt(screenId, 10);
-      return '/' + screensById[screenId].titleSlug;
-    });
+    replaceLink('/%s'));
+  template = template.replace(/\/share\/#\{session.sharedId\}\/project\/#\{projectId\}\/screen\/(\d+)/g,
+    replaceLink('/%s'));
+  template = template.replace(/\?redirect=(\d+)/, replaceLink('?redirect=%s'));
 
   // no need for unescaped attributes
   template = template.replace(/!=/g, '=');

public/javascripts/collections/component.js

@@ -0,0 +1,11 @@
+define(['jquery', 'backbone', './extended', 'models/component'],
+  function($, Backbone, ExtendedCollection, ComponentModel) {
+    return ExtendedCollection.extend({
+      url: function() {
+        return '/projects/' + this.options.projectId + '/screens/' +
+          this.options.screenId + '/components';
+      },
+
+      model: ComponentModel
+    });
+  });

public/javascripts/collections/element.js

@@ -0,0 +1,12 @@
+define(['jquery', 'backbone', './extended', 'models/element'],
+  function($, Backbone, ExtendedCollection, ElementModel) {
+    return ExtendedCollection.extend({
+      url: function() {
+        return '/projects/' + this.options.projectId + '/screens/' +
+          this.options.screenId + '/components/' + this.options.componentId +
+          '/elements';
+      },
+
+      model: ElementModel
+    });
+  });

public/javascripts/collections/extended.js

@@ -0,0 +1,15 @@
+define(['jquery', 'backbone'],
+  function($, Backbone) {
+    var ExtendedCollection = Backbone.Collection.extend({
+      initialize: function(models, options) {
+        this.options = options;
+      },
+
+      constructParent: function(args) {
+        args = Array.prototype.slice.call(args, 0);
+        ExtendedCollection.prototype.initialize.apply(this, args);
+      }
+    });
+
+    return ExtendedCollection;
+  });

public/javascripts/collections/project.js

@@ -0,0 +1,11 @@
+define(['jquery', 'backbone', './extended', 'models/project'],
+  function($, Backbone, ExtendedCollection, ProjectModel) {
+    return ExtendedCollection.extend({
+      url: '/projects',
+      model: ProjectModel,
+
+      comparator: function(project) {
+        return project.get('id');
+      }
+    });
+  });

public/javascripts/collections/screen.js

@@ -0,0 +1,13 @@
+define(['jquery', 'backbone', './extended', 'models/screen'],
+  function($, Backbone, ExtendedCollection, ScreenModel) {
+    return ExtendedCollection.extend({
+      url: function() {
+        return '/projects/' + this.options.projectId + '/screens';
+      },
+
+      model: ScreenModel,
+      comparator: function(screen) {
+        return screen.get('id');
+      }
+    });
+  });