From a4f1af5a6b6140f8f12384bed686844412b63748 Mon Sep 17 00:00:00 2001 From: Chris Snyder Date: Wed, 12 Feb 2014 10:54:15 -0600 Subject: [PATCH 1/2] Rebuild --- lib/active_hash_links.js | 2 +- lib/api.js | 2 +- lib/auto_popup.js | 2 +- lib/bar_graph.js | 8 +++---- lib/controllers/base_form.js | 25 ++++++++----------- lib/controllers/browser_check.js | 8 +++---- lib/controllers/controller.js | 8 +++---- lib/controllers/login_form.js | 6 +---- lib/controllers/top_bar.js | 14 +---------- lib/controllers/tutorial.js | 16 +++---------- lib/dialog.js | 34 ++++++++++---------------- lib/google_analytics.js | 6 ++--- lib/map.js | 39 +++++++++++++----------------- lib/message.js | 12 +--------- lib/models/favorite.js | 5 +--- lib/models/group.js | 8 +++---- lib/models/model.js | 8 +++---- lib/models/profile_item.js | 3 +-- lib/models/recent.js | 10 ++++---- lib/models/subject.js | 8 +++---- lib/models/user.js | 8 +++---- lib/proxy_frame.js | 8 +------ lib/util.js | 2 +- lib/views/login_form.js | 9 ++++++- lib/views/reset_form.js | 1 - lib/views/sign_in_form.js | 21 +++++++++++++++- lib/views/sign_out_form.js | 13 +++++++++- lib/views/sign_up_form.js | 33 ++++++++++++++++++++++++- lib/views/top_bar.js | 41 +++++++++++++++++++++++++++++++- lib/zooniverse.js | 2 +- 30 files changed, 198 insertions(+), 164 deletions(-) diff --git a/lib/active_hash_links.js b/lib/active_hash_links.js index 5d496e1..d9ee090 100644 --- a/lib/active_hash_links.js +++ b/lib/active_hash_links.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, anchors, className, root, updateClasses; diff --git a/lib/api.js b/lib/api.js index 6b20a16..7d1545c 100644 --- a/lib/api.js +++ b/lib/api.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Api, Message, ProxyFrame, _, __slice = [].slice; diff --git a/lib/auto_popup.js b/lib/auto_popup.js index 9ec9af8..49644e6 100644 --- a/lib/auto_popup.js +++ b/lib/auto_popup.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Dialog; diff --git a/lib/bar_graph.js b/lib/bar_graph.js index 580a5f4..2179f76 100644 --- a/lib/bar_graph.js +++ b/lib/bar_graph.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, BarGraph, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -7,7 +7,6 @@ $ = require('jqueryify'); BarGraph = (function() { - BarGraph.prototype.x = null; BarGraph.prototype.y = null; @@ -26,14 +25,13 @@ function BarGraph(params) { this.render = __bind(this.render, this); - - var property, value, _ref; + var property, value; for (property in params) { if (!__hasProp.call(params, property)) continue; value = params[property]; this[property] = value; } - if ((_ref = this.el) == null) { + if (this.el == null) { this.el = $("
"); } this.el = $(this.el); diff --git a/lib/controllers/base_form.js b/lib/controllers/base_form.js index 310576e..93d05bb 100644 --- a/lib/controllers/base_form.js +++ b/lib/controllers/base_form.js @@ -1,6 +1,6 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var $, BaseForm, Controller, SignInForm, SignOutForm, SignUpForm, User, templates, + var $, BaseForm, Controller, SignInForm, SignOutForm, SignUpForm, User, templates, _ref, _ref1, _ref2, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -20,7 +20,6 @@ }; BaseForm = (function(_super) { - __extends(BaseForm, _super); BaseForm.prototype.events = { @@ -43,11 +42,8 @@ function BaseForm() { this.onSignIn = __bind(this.onSignIn, this); - this.onInputChange = __bind(this.onInputChange, this); - this.onError = __bind(this.onError, this); - this.onSubmit = __bind(this.onSubmit, this); BaseForm.__super__.constructor.apply(this, arguments); this.html(this.template()); @@ -98,12 +94,12 @@ })(Controller); SignInForm = (function(_super) { - __extends(SignInForm, _super); function SignInForm() { this.onSubmit = __bind(this.onSubmit, this); - return SignInForm.__super__.constructor.apply(this, arguments); + _ref = SignInForm.__super__.constructor.apply(this, arguments); + return _ref; } SignInForm.prototype.className = 'sign-in'; @@ -124,12 +120,12 @@ })(BaseForm); SignUpForm = (function(_super) { - __extends(SignUpForm, _super); function SignUpForm() { this.onSubmit = __bind(this.onSubmit, this); - return SignUpForm.__super__.constructor.apply(this, arguments); + _ref1 = SignUpForm.__super__.constructor.apply(this, arguments); + return _ref1; } SignUpForm.prototype.className = 'sign-up'; @@ -156,14 +152,13 @@ })(BaseForm); SignOutForm = (function(_super) { - __extends(SignOutForm, _super); function SignOutForm() { this.onSignIn = __bind(this.onSignIn, this); - this.onSubmit = __bind(this.onSubmit, this); - return SignOutForm.__super__.constructor.apply(this, arguments); + _ref2 = SignOutForm.__super__.constructor.apply(this, arguments); + return _ref2; } SignOutForm.prototype.className = 'sign-out'; @@ -176,9 +171,9 @@ }; SignOutForm.prototype.onSignIn = function() { - var _ref; + var _ref3; SignOutForm.__super__.onSignIn.apply(this, arguments); - return this.el.find('.current').html(((_ref = User.current) != null ? _ref.name : void 0) || ''); + return this.el.find('.current').html(((_ref3 = User.current) != null ? _ref3.name : void 0) || ''); }; return SignOutForm; diff --git a/lib/controllers/browser_check.js b/lib/controllers/browser_check.js index 4954ace..f7e1d82 100644 --- a/lib/controllers/browser_check.js +++ b/lib/controllers/browser_check.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, BrowserCheck, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -7,7 +7,6 @@ $ = require('jqueryify'); BrowserCheck = (function() { - BrowserCheck.prototype.view = "
\n
\n
\n

" + (I18n.t('zooniverse.browser_check.wont_work')) + "

\n
\n\n
\n

" + (I18n.t('zooniverse.browser_check.recommended')) + "

\n
\n\n
\n

" + (I18n.t('zooniverse.browser_check.ie')) + "

\n

" + (I18n.t('zooniverse.browser_check.chrome_frame')) + "

\n
\n\n
\n

\n
\n
\n
"; BrowserCheck.prototype.support = { @@ -18,18 +17,17 @@ }; function BrowserCheck(params) { - var property, value, _ref; + var property, value; if (params == null) { params = {}; } this.dismiss = __bind(this.dismiss, this); - for (property in params) { if (!__hasProp.call(params, property)) continue; value = params[property]; this[property] = value; } - if ((_ref = this.el) == null) { + if (this.el == null) { this.el = $(this.view); } this.el.on('click', 'button[name="dismiss"]', this.dismiss); diff --git a/lib/controllers/controller.js b/lib/controllers/controller.js index 5738bdf..4722404 100644 --- a/lib/controllers/controller.js +++ b/lib/controllers/controller.js @@ -1,17 +1,17 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var Controller, Spine, + var Controller, Spine, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; Spine = require('spine'); Controller = (function(_super) { - __extends(Controller, _super); function Controller() { - return Controller.__super__.constructor.apply(this, arguments); + _ref = Controller.__super__.constructor.apply(this, arguments); + return _ref; } return Controller; diff --git a/lib/controllers/login_form.js b/lib/controllers/login_form.js index 4059547..48ce039 100644 --- a/lib/controllers/login_form.js +++ b/lib/controllers/login_form.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Controller, Form, LoginForm, User, templates, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -22,7 +22,6 @@ }; LoginForm = (function(_super) { - __extends(LoginForm, _super); LoginForm.prototype.className = 'zooniverse-login-form'; @@ -47,11 +46,8 @@ function LoginForm() { this.onSignIn = __bind(this.onSignIn, this); - this.reset = __bind(this.reset, this); - this.signUp = __bind(this.signUp, this); - this.signIn = __bind(this.signIn, this); LoginForm.__super__.constructor.apply(this, arguments); this.html(templates.login()); diff --git a/lib/controllers/top_bar.js b/lib/controllers/top_bar.js index a85197f..f6720be 100644 --- a/lib/controllers/top_bar.js +++ b/lib/controllers/top_bar.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Controller, Dialog, Form, LoginForm, TopBar, User, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -16,7 +16,6 @@ LoginForm = require('zooniverse/lib/controllers/login_form'); TopBar = (function(_super) { - __extends(TopBar, _super); TopBar.prototype.className = 'zooniverse-top-bar'; @@ -31,27 +30,16 @@ function TopBar() { this.onClickSignUp = __bind(this.onClickSignUp, this); - this.logInOnEnter = __bind(this.logInOnEnter, this); - this.setLanguage = __bind(this.setLanguage, this); - this.initLanguages = __bind(this.initLanguages, this); - this.onError = __bind(this.onError, this); - this.setUser = __bind(this.setUser, this); - this.render = __bind(this.render, this); - this.toggleDisplay = __bind(this.toggleDisplay, this); - this.startSignUp = __bind(this.startSignUp, this); - this.signOut = __bind(this.signOut, this); - this.logIn = __bind(this.logIn, this); - var _this = this; TopBar.__super__.constructor.apply(this, arguments); this.app || (this.app = "test"); diff --git a/lib/controllers/tutorial.js b/lib/controllers/tutorial.js index 9dae819..339d5ed 100644 --- a/lib/controllers/tutorial.js +++ b/lib/controllers/tutorial.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Dialog, Tutorial, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -9,7 +9,6 @@ Dialog = require('../dialog'); Tutorial = (function() { - Tutorial.prototype.steps = null; Tutorial.prototype.hashMatch = null; @@ -19,20 +18,15 @@ Tutorial.prototype.current = -1; function Tutorial(_arg) { - var _ref, _ref1; this.hashMatch = _arg.hashMatch, this.steps = _arg.steps; this.onHashChange = __bind(this.onHashChange, this); - this.end = __bind(this.end, this); - this.next = __bind(this.next, this); - this.start = __bind(this.start, this); - - if ((_ref = this.steps) == null) { + if (this.steps == null) { this.steps = []; } - if ((_ref1 = this.dialog) == null) { + if (this.dialog == null) { this.dialog = new Dialog({ content: '', buttons: [ @@ -118,7 +112,6 @@ })(); Tutorial.Step = (function() { - Step.prototype.title = ''; Step.prototype.content = ''; @@ -147,11 +140,8 @@ params = {}; } this.leave = __bind(this.leave, this); - this.createBlockers = __bind(this.createBlockers, this); - this.enter = __bind(this.enter, this); - for (property in params) { if (!__hasProp.call(params, property)) continue; value = params[property]; diff --git a/lib/dialog.js b/lib/dialog.js index 1295e78..e4439cc 100644 --- a/lib/dialog.js +++ b/lib/dialog.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Dialog, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -7,9 +7,7 @@ $ = require('jqueryify'); Dialog = (function() { - Dialog.Button = (function() { - Button.prototype.label = 'OK'; Button.prototype.value = null; @@ -23,7 +21,7 @@ Button.prototype.el = null; function Button(params) { - var property, value, _ref, + var property, value, _this = this; if (params == null) { params = {}; @@ -33,7 +31,7 @@ value = params[property]; this[property] = value; } - if ((_ref = this.el) == null) { + if (this.el == null) { this.el = $("<" + this.tag + " class='" + this.className + "'>" + this.label + ""); } this.el.on('click', function() { @@ -83,29 +81,23 @@ Dialog.prototype.promise = null; function Dialog(params) { - var closer, ctorClassName, property, value, _ref, + var closer, ctorClassName, property, value, _this = this; if (params == null) { params = {}; } this.destroy = __bind(this.destroy, this); - this.close = __bind(this.close, this); - this.reattach = __bind(this.reattach, this); - this.attach = __bind(this.attach, this); - this.open = __bind(this.open, this); - this.render = __bind(this.render, this); - for (property in params) { if (!__hasProp.call(params, property)) continue; value = params[property]; this[property] = value; } - if ((_ref = this.buttons) == null) { + if (this.buttons == null) { this.buttons = [ new this.constructor.Button({ label: 'OK', @@ -169,30 +161,30 @@ }; Dialog.prototype.attach = function(attachment) { - var stepOffset, stepSize, target, targetOffset, targetSize, xStrings, yStrings, _base, _base1, _base2, _base3, _base4, _base5, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6; + var stepOffset, stepSize, target, targetOffset, targetSize, xStrings, yStrings, _base, _base1, _base2, _base3, _base4, _base5; this.attachment = attachment != null ? attachment : this.attachment; if (!this.el.hasClass('open')) { return; } - if ((_ref = this.attachment) == null) { + if (this.attachment == null) { this.attachment = {}; } - if ((_ref1 = (_base = this.attachment).x) == null) { + if ((_base = this.attachment).x == null) { _base.x = 'center'; } - if ((_ref2 = (_base1 = this.attachment).y) == null) { + if ((_base1 = this.attachment).y == null) { _base1.y = 'middle'; } - if ((_ref3 = (_base2 = this.attachment).to) == null) { + if ((_base2 = this.attachment).to == null) { _base2.to = 'body'; } - if ((_ref4 = (_base3 = this.attachment).at) == null) { + if ((_base3 = this.attachment).at == null) { _base3.at = {}; } - if ((_ref5 = (_base4 = this.attachment.at).x) == null) { + if ((_base4 = this.attachment.at).x == null) { _base4.x = 'center'; } - if ((_ref6 = (_base5 = this.attachment.at).y) == null) { + if ((_base5 = this.attachment.at).y == null) { _base5.y = 'middle'; } this.arrowDirection = this.attachment.arrowDirection || ''; diff --git a/lib/google_analytics.js b/lib/google_analytics.js index 2be47f1..60b2d18 100644 --- a/lib/google_analytics.js +++ b/lib/google_analytics.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, googleAnalyticsSrc, init, track, _this = this; @@ -12,12 +12,12 @@ } init = function(_arg, trackHashes) { - var account, domain, _ref; + var account, domain; account = _arg.account, domain = _arg.domain; if (trackHashes == null) { trackHashes = true; } - if ((_ref = window._gaq) == null) { + if (window._gaq == null) { window._gaq = []; } window._gaq.push(['_setAccount', account]); diff --git a/lib/map.js b/lib/map.js index 9b484eb..56eb62e 100644 --- a/lib/map.js +++ b/lib/map.js @@ -1,6 +1,6 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var $, Leaflet, Map, + var $, Leaflet, Map, e, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __hasProp = {}.hasOwnProperty, __slice = [].slice; @@ -10,14 +10,14 @@ Leaflet = (function() { try { return require('zooniverse/vendor/leaflet/leaflet-src'); - } catch (e) { + } catch (_error) { + e = _error; console.warn('You should use Leaflet as a CommonJS module.'); return window.L; } })(); Map = (function() { - Map.prototype.latitude = 41.9; Map.prototype.longitude = -87.6; @@ -45,25 +45,18 @@ Map.prototype.map = null; function Map(params) { - var param, url, value, _ref, _ref1, _ref2, _ref3, _ref4, + var param, url, value, _this = this; if (params == null) { params = {}; } this.resize = __bind(this.resize, this); - this.removeLabel = __bind(this.removeLabel, this); - this.addLabel = __bind(this.addLabel, this); - this.removeLayer = __bind(this.removeLayer, this); - this.addLayer = __bind(this.addLayer, this); - this.setZoom = __bind(this.setZoom, this); - this.setCenter = __bind(this.setCenter, this); - for (param in params) { if (!__hasProp.call(params, param)) continue; value = params[param]; @@ -72,34 +65,34 @@ if (!this.apiKey) { throw new Error('Map class needs an apiKey!'); } - if ((_ref = this.centerOffset) == null) { + if (this.centerOffset == null) { this.centerOffset = [0.5, 0.5]; } - if ((_ref1 = this.el) == null) { + if (this.el == null) { this.el = $('
'); } if (this.className) { this.el.addClass(this.className); } - if ((_ref2 = this.layers) == null) { + if (this.layers == null) { this.layers = []; } if (!(this.layers instanceof Array)) { this.layers = [this.layers]; } - if ((_ref3 = this.labels) == null) { + if (this.labels == null) { this.labels = []; } - if ((_ref4 = this.map) == null) { + if (this.map == null) { this.map = new Leaflet.Map(this.el.get(0), { center: new Leaflet.LatLng(this.latitude, this.longitude), zoom: this.zoom, layers: [new Leaflet.TileLayer("http://{s}.tile.cloudmade.com/" + this.apiKey + "/" + this.tilesId + "/256/{z}/{x}/{y}.png")].concat(__slice.call((function() { - var _i, _len, _ref5, _results; - _ref5 = this.layers; + var _i, _len, _ref, _results; + _ref = this.layers; _results = []; - for (_i = 0, _len = _ref5.length; _i < _len; _i++) { - url = _ref5[_i]; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + url = _ref[_i]; _results.push(new Leaflet.TileLayer(url)); } return _results; @@ -116,8 +109,8 @@ }); this.setCenter(this.latitude, this.longitude); $(window).on('hashchange', function() { - var x, y, _ref5; - _ref5 = _this.map.getSize(), x = _ref5.x, y = _ref5.y; + var x, y, _ref; + _ref = _this.map.getSize(), x = _ref.x, y = _ref.y; if (0 === x || 0 === y) { return setTimeout(_this.resize); } diff --git a/lib/message.js b/lib/message.js index bdc5a2f..02514fa 100644 --- a/lib/message.js +++ b/lib/message.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Message, _, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -9,28 +9,18 @@ _ = require('underscore/underscore'); Message = (function() { - function Message(payload, proxy) { this.payload = payload; this.proxy = proxy; this.tapped = __bind(this.tapped, this); - this.isDelivered = __bind(this.isDelivered, this); - this.project = __bind(this.project, this); - this.fail = __bind(this.fail, this); - this.succeed = __bind(this.succeed, this); - this.onFailure = __bind(this.onFailure, this); - this.onSuccess = __bind(this.onSuccess, this); - this.always = __bind(this.always, this); - this.send = __bind(this.send, this); - this.sent = false; this.deferred = new $.Deferred; } diff --git a/lib/models/favorite.js b/lib/models/favorite.js index aeb3ca2..0b0ef23 100644 --- a/lib/models/favorite.js +++ b/lib/models/favorite.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Api, Favorite, ProfileItem, User, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -12,16 +12,13 @@ User = require('./user'); Favorite = (function(_super) { - __extends(Favorite, _super); Favorite.configure("Favorite", "project_id", "workflow_id", "subjects", "created_at"); function Favorite() { this.unfavorite = __bind(this.unfavorite, this); - this.send = __bind(this.send, this); - this.toJSON = __bind(this.toJSON, this); Favorite.__super__.constructor.apply(this, arguments); } diff --git a/lib/models/group.js b/lib/models/group.js index 8006562..3af82c8 100644 --- a/lib/models/group.js +++ b/lib/models/group.js @@ -1,6 +1,6 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var $, Api, Group, Model, _, + var $, Api, Group, Model, _, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -13,11 +13,11 @@ _ = require('underscore/underscore'); Group = (function(_super) { - __extends(Group, _super); function Group() { - return Group.__super__.constructor.apply(this, arguments); + _ref = Group.__super__.constructor.apply(this, arguments); + return _ref; } Group.configure('Group'); diff --git a/lib/models/model.js b/lib/models/model.js index 4f6cde0..2c97939 100644 --- a/lib/models/model.js +++ b/lib/models/model.js @@ -1,17 +1,17 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var Model, Spine, + var Model, Spine, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; Spine = require('spine'); Model = (function(_super) { - __extends(Model, _super); function Model() { - return Model.__super__.constructor.apply(this, arguments); + _ref = Model.__super__.constructor.apply(this, arguments); + return _ref; } Model.withParams = function(url, params) { diff --git a/lib/models/profile_item.js b/lib/models/profile_item.js index 23ff604..56ed9ae 100644 --- a/lib/models/profile_item.js +++ b/lib/models/profile_item.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Api, Model, ProfileItem, Subject, User, _, __hasProp = {}.hasOwnProperty, @@ -15,7 +15,6 @@ _ = require('underscore/underscore'); ProfileItem = (function(_super) { - __extends(ProfileItem, _super); ProfileItem.configure("ProfileItem", "project_id", "workflow_id", "subjects", "created_at"); diff --git a/lib/models/recent.js b/lib/models/recent.js index 7d53707..805a1e4 100644 --- a/lib/models/recent.js +++ b/lib/models/recent.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Api, Favorite, ProfileItem, Recent, User, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, @@ -14,14 +14,12 @@ User = require('./user'); Recent = (function(_super) { - __extends(Recent, _super); Recent.configure('Recent', 'project_id', 'workflow_id', 'subjects', 'created_at', 'favorited', 'favorite_id'); function Recent() { this.favorite = __bind(this.favorite, this); - this.unfavorite = __bind(this.unfavorite, this); Recent.__super__.constructor.apply(this, arguments); } @@ -47,14 +45,14 @@ }; Recent.prototype.unfavorite = function() { - var fetcher; + var error, fetcher; if (!this.favorited) { return; } try { Favorite.find(this.favorite_id).destroy(); - } catch (error) { - + } catch (_error) { + error = _error; } fetcher = Api["delete"]("/projects/" + User.project + "/favorites/" + this.favorite_id); this.favorited = false; diff --git a/lib/models/subject.js b/lib/models/subject.js index d6395aa..e28ec1f 100644 --- a/lib/models/subject.js +++ b/lib/models/subject.js @@ -1,6 +1,6 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var $, Api, Model, Subject, _, + var $, Api, Model, Subject, _, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -13,11 +13,11 @@ _ = require('underscore/underscore'); Subject = (function(_super) { - __extends(Subject, _super); function Subject() { - return Subject.__super__.constructor.apply(this, arguments); + _ref = Subject.__super__.constructor.apply(this, arguments); + return _ref; } Subject.configure('Subject', 'zooniverse_id', 'coords', 'location', 'metadata'); diff --git a/lib/models/user.js b/lib/models/user.js index a8b826d..efb5be6 100644 --- a/lib/models/user.js +++ b/lib/models/user.js @@ -1,6 +1,6 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { - var Api, Model, ProxyFrame, User, + var Api, Model, ProxyFrame, User, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -11,11 +11,11 @@ ProxyFrame = require('../proxy_frame'); User = (function(_super) { - __extends(User, _super); function User() { - return User.__super__.constructor.apply(this, arguments); + _ref = User.__super__.constructor.apply(this, arguments); + return _ref; } User.configure('User'); diff --git a/lib/proxy_frame.js b/lib/proxy_frame.js index ad2d25e..d4350d2 100644 --- a/lib/proxy_frame.js +++ b/lib/proxy_frame.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, ProxyFrame, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; @@ -6,22 +6,16 @@ $ = require('jqueryify'); ProxyFrame = (function() { - ProxyFrame.headers = {}; function ProxyFrame(host, path) { this.host = host; this.path = path != null ? path : '/proxy'; this.receive = __bind(this.receive, this); - this.send = __bind(this.send, this); - this.postMessage = __bind(this.postMessage, this); - this.appended = __bind(this.appended, this); - this.elFrame = __bind(this.elFrame, this); - this.append(); $(window).on('message', this.receive); } diff --git a/lib/util.js b/lib/util.js index 43a825e..d305112 100644 --- a/lib/util.js +++ b/lib/util.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var $, Spine, dateWords, days, months; diff --git a/lib/views/login_form.js b/lib/views/login_form.js index 615d7b4..af296a9 100644 --- a/lib/views/login_form.js +++ b/lib/views/login_form.js @@ -37,8 +37,15 @@ module.exports = function(__obj) { } (function() { (function() { + __out.push('
\n
\n
\n\n
\n \n \n \n
\n \n
\n'); + __out.push(I18n.t('zooniverse.sign_up.sign_in')); + + __out.push('\n \n\n\n
\n'); }).call(this); diff --git a/lib/views/reset_form.js b/lib/views/reset_form.js index 743a1c4..96dba80 100644 --- a/lib/views/reset_form.js +++ b/lib/views/reset_form.js @@ -37,7 +37,6 @@ module.exports = function(__obj) { } (function() { (function() { - __out.push('

Enter your username or email address and we\'ll send you instructions on how to reset your password

\n

\n
\n \n \n
\n

Check your email for instructions!

\n'); }).call(this); diff --git a/lib/views/sign_in_form.js b/lib/views/sign_in_form.js index 23fe956..10ae333 100644 --- a/lib/views/sign_in_form.js +++ b/lib/views/sign_in_form.js @@ -37,8 +37,27 @@ module.exports = function(__obj) { } (function() { (function() { + __out.push('

'); - __out.push('

Sign in with your Zooniverse account

\n

\n
\n \n \n \n
\n

Signing in...

\n'); + __out.push(I18n.t('zooniverse.sign_in.title')); + + __out.push('

\n

\n
\n \n \n \n
\n

'); + + __out.push(I18n.t('zooniverse.sign_in.progress')); + + __out.push('

\n'); }).call(this); diff --git a/lib/views/sign_out_form.js b/lib/views/sign_out_form.js index c130194..fcc14ed 100644 --- a/lib/views/sign_out_form.js +++ b/lib/views/sign_out_form.js @@ -37,8 +37,19 @@ module.exports = function(__obj) { } (function() { (function() { + __out.push('
\n

'); - __out.push('\n

Currently logged in as .

\n
\n

Signing out...

\n'); + __out.push(I18n.t('zooniverse.sign_out.current')); + + __out.push('

\n\n

'); + + __out.push(I18n.t('zooniverse.sign_out.progress')); + + __out.push('

\n'); }).call(this); diff --git a/lib/views/sign_up_form.js b/lib/views/sign_up_form.js index ab22dc0..2a78c43 100644 --- a/lib/views/sign_up_form.js +++ b/lib/views/sign_up_form.js @@ -37,8 +37,39 @@ module.exports = function(__obj) { } (function() { (function() { + __out.push('

'); - __out.push('

Sign up for a new Zooniverse account

\n

\n
\n \n \n \n \n \n \n
\n

Creating account and signing in...

\n'); + __out.push(I18n.t('zooniverse.sign_up.title')); + + __out.push('

\n

\n
\n \n \n \n \n \n \n
\n

'); + + __out.push(I18n.t('zooniverse.sign_up.progress')); + + __out.push('

\n'); }).call(this); diff --git a/lib/views/top_bar.js b/lib/views/top_bar.js index d5d0ef4..378f72d 100644 --- a/lib/views/top_bar.js +++ b/lib/views/top_bar.js @@ -37,8 +37,47 @@ module.exports = function(__obj) { } (function() { (function() { + __out.push('
\n
\n

'); - __out.push('
\n
\n

is a Zooniverse project.

\n

The Zooniverse is a collection of web-based Citizen Science projects that use the efforts and abilities of volunteers to help reseachers deal with the flood of data that confronts them.

\n
\n
\n

Our Projects

\n

We currently have 12 projects on subjects ranging from astronomy, to climatology, to biology, to humanities.

\n
\n
\n \n
\n
\n
\n
\n
\n \n \n
\n
\n

Forgot Password?

\n
\n
\n
\n \n \n
\n

\n

Signing In...

\n
\n
\n
\n
\n
\n
\n \n
\n'); + __out.push(I18n.t('zooniverse.top_bar.title')); + + __out.push('

\n

'); + + __out.push(I18n.t('zooniverse.top_bar.description')); + + __out.push('

\n
\n
\n

'); + + __out.push(I18n.t('zooniverse.top_bar.projects.title')); + + __out.push('

\n

'); + + __out.push(I18n.t('zooniverse.top_bar.projects.list')); + + __out.push('

\n
\n
\n \n
\n
\n
\n
\n
\n \n \n
\n
\n

'); + + __out.push(I18n.t('zooniverse.login.forgot_password')); + + __out.push('

\n
\n
\n
\n \n \n
\n

\n

'); + + __out.push(I18n.t('zooniverse.sign_in.progress')); + + __out.push('

\n
\n
\n
\n
\n
\n
\n \n
\n'); }).call(this); diff --git a/lib/zooniverse.js b/lib/zooniverse.js index 5095406..d73fa31 100644 --- a/lib/zooniverse.js +++ b/lib/zooniverse.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Zooniverse; From c0c9bc1e13b03bf0ce6ca9fddf33abbbadd64ad5 Mon Sep 17 00:00:00 2001 From: Chris Snyder Date: Wed, 12 Feb 2014 10:57:43 -0600 Subject: [PATCH 2/2] Bugfix --- lib/views/top_bar.js | 4 ++-- src/views/top_bar.eco | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/views/top_bar.js b/lib/views/top_bar.js index 378f72d..2a997d7 100644 --- a/lib/views/top_bar.js +++ b/lib/views/top_bar.js @@ -55,11 +55,11 @@ module.exports = function(__obj) { __out.push('

\n \n
\n \n
\n