fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-02-08 17:13:58 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed user load

Browse Source
This commit is contained in:
Fergal Moran
2013-10-28 20:47:44 +00:00
parent be14a2cf40
commit bd2934258d
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/app/lib/controller.coffee
View File

@@ -4,7 +4,6 @@ define ['app', 'marionette', 'vent', 'utils'
'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'],
(App, Marionette, vent, utils,
MixListLayout, MixListView, MixDetailView,
StreamListLayout,
MixEditView, UserProfileView, UserListView, UserEditView,
MixItem, MixCollection, UserItem)->
class DssController extends Marionette.Controller

2
static/js/app/lib/controller.js
View File

@@ -3,7 +3,7 @@
var __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; };
define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, StreamListLayout, MixEditView, UserProfileView, UserListView, UserEditView, MixItem, MixCollection, UserItem) {
define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, MixEditView, UserProfileView, UserListView, UserEditView, MixItem, MixCollection, UserItem) {
var DssController;
DssController = (function(_super) {

9
static/js/app/lib/dssView.js
View File

@@ -1,17 +1,16 @@
// Generated by CoffeeScript 1.6.2
// Generated by CoffeeScript 1.4.0
(function() {
var __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; };
define(['marionette', 'utils'], function(Marionette, utils) {
var DssView, _ref;
var DssView;
DssView = (function(_super) {
__extends(DssView, _super);
function DssView() {
_ref = DssView.__super__.constructor.apply(this, arguments);
return _ref;
return DssView.__super__.constructor.apply(this, arguments);
}
DssView.prototype.templateHelpers = {

1
static/js/app/views/user/userItemView.coffee
View File

@@ -11,5 +11,4 @@ define ['app', 'moment', 'app.lib/dssView', 'vent', 'text!/tpl/UserListItemView'
initialize: =>
@listenTo(@model, 'change:is_following', @render)
UserItemView

10
static/js/app/views/user/userItemView.js
View File

@@ -1,18 +1,18 @@
// Generated by CoffeeScript 1.6.2
// Generated by CoffeeScript 1.4.0
(function() {
var __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; };
define(['app', 'moment', 'app.lib/dssView', 'vent', 'text!/tpl/UserListItemView'], function(App, moment, DssView, vent, Template) {
var UserItemView, _ref;
var UserItemView;
UserItemView = (function(_super) {
__extends(UserItemView, _super);
function UserItemView() {
this.initialize = __bind(this.initialize, this); _ref = UserItemView.__super__.constructor.apply(this, arguments);
return _ref;
this.initialize = __bind(this.initialize, this);
return UserItemView.__super__.constructor.apply(this, arguments);
}
UserItemView.prototype.template = _.template(Template);

2
templates/views/UserListItemView.html
View File

@@ -39,8 +39,6 @@
<div class="space-4"></div>
<div class="width-80 label label-info label-xlg arrowed-in arrowed-in-right">
<div class="inline position-relative">
<% if (isMe(id)) { %>
<a href="#" data-bypass="true" class="user-title-label dropdown-toggle" data-toggle="dropdown">
<i class="icon-circle light-green middle"></i>