Removed explicit width on mix image

This commit is contained in:
Fergal Moran
2013-09-26 19:32:29 +01:00
parent 644d23f64d
commit a85adbfe1d
21 changed files with 136 additions and 100 deletions

View File

@@ -405,8 +405,8 @@ div.event-content td {
} }
.mix-image-container img { .mix-image-container img {
height: 108px; max-width: 100%;
width: 155px; max-height: 100%;
} }
.btn.loading { .btn.loading {

View File

@@ -1,18 +1,18 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__hasProp = {}.hasOwnProperty, __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; }; __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.lib/dssView', 'utils', 'ace-editable', 'lib/bootstrap-typeahead'], function(DssView, utils) { define(['app.lib/dssView', 'utils', 'ace-editable', 'lib/bootstrap-typeahead'], function(DssView, utils) {
var EditableView; var EditableView, _ref;
EditableView = (function(_super) {
EditableView = (function(_super) {
__extends(EditableView, _super); __extends(EditableView, _super);
function EditableView() { function EditableView() {
this.setupImageEditable = __bind(this.setupImageEditable, this); this.setupImageEditable = __bind(this.setupImageEditable, this); _ref = EditableView.__super__.constructor.apply(this, arguments);
return EditableView.__super__.constructor.apply(this, arguments); return _ref;
} }
EditableView.prototype.events = { EditableView.prototype.events = {
@@ -22,6 +22,7 @@
EditableView.prototype.changeSelect = function(evt) { EditableView.prototype.changeSelect = function(evt) {
var changed, obj, objInst, value; var changed, obj, objInst, value;
changed = evt.currentTarget; changed = evt.currentTarget;
if (id) { if (id) {
value = $(evt.currentTarget).val(); value = $(evt.currentTarget).val();
@@ -33,6 +34,7 @@
EditableView.prototype.changed = function(evt) { EditableView.prototype.changed = function(evt) {
var changed, obj, objInst, value; var changed, obj, objInst, value;
return; return;
changed = evt.currentTarget; changed = evt.currentTarget;
if (changed.id) { if (changed.id) {
@@ -52,6 +54,7 @@
EditableView.prototype._bakeForm = function(el, lookups) { EditableView.prototype._bakeForm = function(el, lookups) {
var labels, mapped, model; var labels, mapped, model;
model = this.model; model = this.model;
labels = void 0; labels = void 0;
mapped = void 0; mapped = void 0;
@@ -104,6 +107,7 @@
EditableView.prototype._saveChanges = function() { EditableView.prototype._saveChanges = function() {
var args, error, _results; var args, error, _results;
args = arguments; args = arguments;
if (!this.model.isValid()) { if (!this.model.isValid()) {
if (this.model.errors) { if (this.model.errors) {
@@ -124,7 +128,9 @@
}; };
EditableView.prototype.setupImageEditable = function(options) { EditableView.prototype.setupImageEditable = function(options) {
var _this = this; var e,
_this = this;
$.fn.editable.defaults.mode = 'inline'; $.fn.editable.defaults.mode = 'inline';
try { try {
if (/msie\s*(8|7|6)/.test(navigator.userAgent.toLowerCase())) { if (/msie\s*(8|7|6)/.test(navigator.userAgent.toLowerCase())) {
@@ -164,13 +170,15 @@
}); });
} }
}); });
} catch (e) { } catch (_error) {
e = _error;
return console.log(e); return console.log(e);
} }
}; };
EditableView.prototype.uploadImage = function(options) { EditableView.prototype.uploadImage = function(options) {
var $form, deferred, fd, file_input, files, iframe_id; var $form, deferred, e, fd, file_input, files, iframe_id;
$form = options.el.next().find(".editableform:eq(0)"); $form = options.el.next().find(".editableform:eq(0)");
file_input = $form.find("input[type=file]:eq(0)"); file_input = $form.find("input[type=file]:eq(0)");
if (!("FormData" in window)) { if (!("FormData" in window)) {
@@ -188,6 +196,7 @@
$form.get(0).submit(); $form.get(0).submit();
setTimeout((function() { setTimeout((function() {
var iframe; var iframe;
iframe = document.getElementById(iframe_id); iframe = document.getElementById(iframe_id);
if (iframe != null) { if (iframe != null) {
iframe.src = "about:blank"; iframe.src = "about:blank";
@@ -202,7 +211,8 @@
fd = null; fd = null;
try { try {
fd = new FormData($form.get(0)); fd = new FormData($form.get(0));
} catch (e) { } catch (_error) {
e = _error;
fd = new FormData(); fd = new FormData();
$.each($form.serializeArray(), function(index, item) { $.each($form.serializeArray(), function(index, item) {
return fd.append(item.name, item.value); return fd.append(item.name, item.value);
@@ -228,6 +238,7 @@
data: fd, data: fd,
xhr: function() { xhr: function() {
var req; var req;
req = $.ajaxSettings.xhr(); req = $.ajaxSettings.xhr();
return req; return req;
}, },

View File

@@ -1,6 +1,5 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
define(['marionette'], function() { define(['marionette'], function() {
return new Backbone.Wreqr.EventAggregator; return new Backbone.Wreqr.EventAggregator;
}); });

View File

@@ -1,21 +1,20 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
define(['vent', 'socket.io'], function(vent, SocketIO) { define(['vent', 'socket.io'], function(vent, SocketIO) {
var RealtimeController; var RealtimeController;
RealtimeController = (function() {
RealtimeController = (function() {
function RealtimeController() {} function RealtimeController() {}
RealtimeController.prototype.startSocketIO = function() { RealtimeController.prototype.startSocketIO = function() {
var _this = this; var _this = this;
console.log("RealtimeController: Socket IO starting"); console.log("RealtimeController: Socket IO starting");
this.socket = SocketIO.connect(com.podnoms.settings.REALTIME_HOST); this.socket = SocketIO.connect(com.podnoms.settings.REALTIME_HOST);
this.socket.on("hello", function(data) { this.socket.on("hello", function(data) {
return console.log("RealtimeController: Connected " + data['message']); return console.log("RealtimeController: Connected " + data['message']);
}); });
"@socket.on \"activity\", (data) =>\n console.log(\"RealtimeController: activity \" + data['message'])\n vent.trigger(\"model:activity:new\", data['message'])"; "@socket.on \"activity\", (data) =>\n console.log(\"RealtimeController: activity \" + data['message'])\n vent.trigger(\"model:activity:new\", data['message'])";
return this.socket.on("notification", function(data) { return this.socket.on("notification", function(data) {
console.log("RealtimeController: notification " + data['message']); console.log("RealtimeController: notification " + data['message']);
return vent.trigger("model:notification:new", data['message']); return vent.trigger("model:notification:new", data['message']);

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'vent', 'app.lib/controller'], function(Marionette, vent, Controller) { define(['marionette', 'vent', 'app.lib/controller'], function(Marionette, vent, Controller) {
var DssRouter; var DssRouter, _ref;
return DssRouter = (function(_super) {
return DssRouter = (function(_super) {
__extends(DssRouter, _super); __extends(DssRouter, _super);
function DssRouter() { function DssRouter() {
return DssRouter.__super__.constructor.apply(this, arguments); _ref = DssRouter.__super__.constructor.apply(this, arguments);
return _ref;
} }
DssRouter.prototype.controller = new Controller; DssRouter.prototype.controller = new Controller;

View File

@@ -1,6 +1,5 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
define(['jquery', 'utils'], function($, utils) { define(['jquery', 'utils'], function($, utils) {
return { return {
postFacebookLike: function(mixId) { postFacebookLike: function(mixId) {
@@ -14,6 +13,7 @@
}, },
sharePageToTwitter: function(model) { sharePageToTwitter: function(model) {
var loc, title; var loc, title;
loc = $(this).attr("href"); loc = $(this).attr("href");
title = $(this).attr("title"); title = $(this).attr("title");
return window.open("http://twitter.com/share?url=" + "http://" + window.location.host + "/" + model.get("item_url") + "&text=" + model.get("title"), "twitterwindow", "height=450, width=550, top=" + ($(window).height() / 2 - 225) + ", left=" + $(window).width() / 2 + ", toolbar=0, location=0, menubar=0, directories=0, scrollbars=0"); return window.open("http://twitter.com/share?url=" + "http://" + window.location.host + "/" + model.get("item_url") + "&text=" + model.get("title"), "twitterwindow", "height=450, width=550, top=" + ($(window).height() / 2 - 225) + ", left=" + $(window).width() / 2 + ", toolbar=0, location=0, menubar=0, directories=0, scrollbars=0");

View File

@@ -1,6 +1,5 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
define(['jquery', 'bootstrap', 'toastr'], function($, bootstrap, toastr) { define(['jquery', 'bootstrap', 'toastr'], function($, bootstrap, toastr) {
return { return {
modal: function(url) { modal: function(url) {
@@ -23,6 +22,7 @@
}, },
checkPlayCount: function() { checkPlayCount: function() {
var _this = this; var _this = this;
if (document.cookie.indexOf("sessionId")) { if (document.cookie.indexOf("sessionId")) {
$.getJSON("/ajax/session_play_count", function(data) { $.getJSON("/ajax/session_play_count", function(data) {
console.log("utils: got playcount"); console.log("utils: got playcount");
@@ -48,6 +48,7 @@
generateGuid: function() { generateGuid: function() {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
var r, v; var r, v;
r = Math.random() * 16 | 0; r = Math.random() * 16 | 0;
v = (c === "x" ? r : r & 0x3 | 0x8); v = (c === "x" ? r : r & 0x3 | 0x8);
return v.toString(16); return v.toString(16);
@@ -55,6 +56,7 @@
}, },
downloadURL: function(url) { downloadURL: function(url) {
var iframe; var iframe;
iframe = document.getElementById("hiddenDownloader"); iframe = document.getElementById("hiddenDownloader");
if (iframe === null) { if (iframe === null) {
iframe = document.createElement("iframe"); iframe = document.createElement("iframe");

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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.lib/backbone.dss.model'], function(DSSModel) { define(['app.lib/backbone.dss.model'], function(DSSModel) {
var CommentItem; var CommentItem, _ref;
CommentItem = (function(_super) {
CommentItem = (function(_super) {
__extends(CommentItem, _super); __extends(CommentItem, _super);
function CommentItem() { function CommentItem() {
return CommentItem.__super__.constructor.apply(this, arguments); _ref = CommentItem.__super__.constructor.apply(this, arguments);
return _ref;
} }
CommentItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "comments/"; CommentItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "comments/";

View File

@@ -1,23 +1,23 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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(['models/comment/commentCollection', 'models/comment/commentItem', 'app.lib/backbone.dss.model'], function(CommentCollection, CommentItem, DSSModel) { define(['models/comment/commentCollection', 'models/comment/commentItem', 'app.lib/backbone.dss.model'], function(CommentCollection, CommentItem, DSSModel) {
var MixItem; var MixItem, _ref;
MixItem = (function(_super) {
MixItem = (function(_super) {
__extends(MixItem, _super); __extends(MixItem, _super);
function MixItem() { function MixItem() {
return MixItem.__super__.constructor.apply(this, arguments); _ref = MixItem.__super__.constructor.apply(this, arguments);
return _ref;
} }
MixItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "mix/"; MixItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "mix/";
"relations: [\n type: Backbone.HasMany\n key: \"comments\"\n relatedModel: CommentItem\n collectionType: CommentCollection\n reverseRelation:\n key: \"hasItems\"\n includeInJSON: \"id\"\n ]"; "relations: [\n type: Backbone.HasMany\n key: \"comments\"\n relatedModel: CommentItem\n collectionType: CommentCollection\n reverseRelation:\n key: \"hasItems\"\n includeInJSON: \"id\"\n ]";
return MixItem; return MixItem;
})(DSSModel); })(DSSModel);

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'text!/tpl/ActivityListItemView'], function(Marionette, Template) { define(['marionette', 'text!/tpl/ActivityListItemView'], function(Marionette, Template) {
var ActivityItemView; var ActivityItemView, _ref;
return ActivityItemView = (function(_super) {
return ActivityItemView = (function(_super) {
__extends(ActivityItemView, _super); __extends(ActivityItemView, _super);
function ActivityItemView() { function ActivityItemView() {
return ActivityItemView.__super__.constructor.apply(this, arguments); _ref = ActivityItemView.__super__.constructor.apply(this, arguments);
return _ref;
} }
ActivityItemView.prototype.template = _.template(Template); ActivityItemView.prototype.template = _.template(Template);

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'models/activity/activityCollection', 'views/activity/activityItemView', 'text!/tpl/ActivityListView'], function(Marionette, ActivityCollection, ActivityItemView, Template) { define(['marionette', 'models/activity/activityCollection', 'views/activity/activityItemView', 'text!/tpl/ActivityListView'], function(Marionette, ActivityCollection, ActivityItemView, Template) {
var ActivityListView; var ActivityListView, _ref;
ActivityListView = (function(_super) {
ActivityListView = (function(_super) {
__extends(ActivityListView, _super); __extends(ActivityListView, _super);
function ActivityListView() { function ActivityListView() {
return ActivityListView.__super__.constructor.apply(this, arguments); _ref = ActivityListView.__super__.constructor.apply(this, arguments);
return _ref;
} }
ActivityListView.prototype.template = _.template(Template); ActivityListView.prototype.template = _.template(Template);
@@ -30,6 +31,7 @@
ActivityListView.prototype.appendHtml = function(collectionView, itemView, index) { ActivityListView.prototype.appendHtml = function(collectionView, itemView, index) {
var children, childrenContainer; var children, childrenContainer;
childrenContainer = (collectionView.itemViewContainer ? collectionView.$(collectionView.itemViewContainer) : collectionView.$el); childrenContainer = (collectionView.itemViewContainer ? collectionView.$(collectionView.itemViewContainer) : collectionView.$el);
children = childrenContainer.children(); children = childrenContainer.children();
if (children.size() <= index) { if (children.size() <= index) {

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'models/comment/commentItem', 'views/comment/commentItemView', 'text!/tpl/CommentListView'], function(Marionette, CommentItem, CommentItemView, Template) { define(['marionette', 'models/comment/commentItem', 'views/comment/commentItemView', 'text!/tpl/CommentListView'], function(Marionette, CommentItem, CommentItemView, Template) {
var CommentListView; var CommentListView, _ref;
CommentListView = (function(_super) {
CommentListView = (function(_super) {
__extends(CommentListView, _super); __extends(CommentListView, _super);
function CommentListView() { function CommentListView() {
return CommentListView.__super__.constructor.apply(this, arguments); _ref = CommentListView.__super__.constructor.apply(this, arguments);
return _ref;
} }
CommentListView.prototype.template = _.template(Template); CommentListView.prototype.template = _.template(Template);
@@ -33,6 +34,7 @@
CommentListView.prototype.addComment = function() { CommentListView.prototype.addComment = function() {
var _this = this; var _this = this;
console.log("CommentListView: addComment"); console.log("CommentListView: addComment");
this.collection.create({ this.collection.create({
mix_id: this.collection.mix.get("id"), mix_id: this.collection.mix.get("id"),

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'models/mix/mixItem', 'views/mix/mixItemView', 'text!/tpl/MixDetailView'], function(Marionette, MixItem, MixItemView, Template) { define(['marionette', 'models/mix/mixItem', 'views/mix/mixItemView', 'text!/tpl/MixDetailView'], function(Marionette, MixItem, MixItemView, Template) {
var MixDetailView; var MixDetailView, _ref;
MixDetailView = (function(_super) {
MixDetailView = (function(_super) {
__extends(MixDetailView, _super); __extends(MixDetailView, _super);
function MixDetailView() { function MixDetailView() {
return MixDetailView.__super__.constructor.apply(this, arguments); _ref = MixDetailView.__super__.constructor.apply(this, arguments);
return _ref;
} }
MixDetailView.prototype.template = _.template(Template); MixDetailView.prototype.template = _.template(Template);
@@ -22,6 +23,7 @@
MixDetailView.prototype.onRender = function() { MixDetailView.prototype.onRender = function() {
var view; var view;
view = new MixItemView({ view = new MixItemView({
tagName: "div", tagName: "div",
className: "mix-listing audio-listing-single", className: "mix-listing audio-listing-single",

View File

@@ -1,18 +1,18 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__hasProp = {}.hasOwnProperty, __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; }; __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.lib/editableView', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/MixEditView', 'jquery.fileupload', 'jquery.fileupload-process', 'jquery.fileupload-audio', 'jquery.fileupload-ui', 'jquery.iframe-transport', 'jquery.ui.widget', 'lib/select2', 'lib/ajaxfileupload', 'ace', 'lib/bootstrap-tag.min'], function(EditableView, moment, utils, Syphon, Template) { define(['app.lib/editableView', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/MixEditView', 'jquery.fileupload', 'jquery.fileupload-process', 'jquery.fileupload-audio', 'jquery.fileupload-ui', 'jquery.iframe-transport', 'jquery.ui.widget', 'lib/select2', 'lib/ajaxfileupload', 'ace', 'lib/bootstrap-tag.min'], function(EditableView, moment, utils, Syphon, Template) {
var MixEditView; var MixEditView, _ref;
return MixEditView = (function(_super) {
return MixEditView = (function(_super) {
__extends(MixEditView, _super); __extends(MixEditView, _super);
function MixEditView() { function MixEditView() {
this.saveChanges = __bind(this.saveChanges, this); this.saveChanges = __bind(this.saveChanges, this); _ref = MixEditView.__super__.constructor.apply(this, arguments);
return MixEditView.__super__.constructor.apply(this, arguments); return _ref;
} }
MixEditView.prototype.template = _.template(Template); MixEditView.prototype.template = _.template(Template);
@@ -45,6 +45,7 @@
MixEditView.prototype.onDomRefresh = function() { MixEditView.prototype.onDomRefresh = function() {
var _this = this; var _this = this;
$("#fileupload", this.el).fileupload({ $("#fileupload", this.el).fileupload({
downloadTemplateId: void 0, downloadTemplateId: void 0,
url: "/_upload/", url: "/_upload/",
@@ -70,6 +71,7 @@
MixEditView.prototype.onRender = function() { MixEditView.prototype.onRender = function() {
var parent; var parent;
console.log("MixEditView: onRender"); console.log("MixEditView: onRender");
this.sendImage = false; this.sendImage = false;
parent = this; parent = this;
@@ -101,6 +103,7 @@
}, },
initSelection: function(element, callback) { initSelection: function(element, callback) {
var genres, result; var genres, result;
console.log("MixEditView: genres:initSelection"); console.log("MixEditView: genres:initSelection");
result = []; result = [];
genres = parent.model.get("genre-list"); genres = parent.model.get("genre-list");
@@ -131,6 +134,7 @@
MixEditView.prototype.saveChanges = function() { MixEditView.prototype.saveChanges = function() {
var data, var data,
_this = this; _this = this;
console.log("MixEditView: saveChanges"); console.log("MixEditView: saveChanges");
data = Syphon.serialize($("#mix-details-form", this.el)[0]); data = Syphon.serialize($("#mix-details-form", this.el)[0]);
this.model.set(data); this.model.set(data);
@@ -187,7 +191,6 @@
MixEditView; MixEditView;
return MixEditView; return MixEditView;
})(EditableView); })(EditableView);

View File

@@ -1,26 +1,22 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__hasProp = {}.hasOwnProperty, __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; }; __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(['moment', 'app', 'vent', 'marionette', 'utils', 'models/comment/commentCollection', 'views/comment/commentListView', 'text!/tpl/MixListItemView'], function(moment, App, vent, Marionette, utils, CommentsCollection, CommentsListView, Template) { define(['moment', 'app', 'vent', 'marionette', 'utils', 'models/comment/commentCollection', 'views/comment/commentListView', 'text!/tpl/MixListItemView'], function(moment, App, vent, Marionette, utils, CommentsCollection, CommentsListView, Template) {
var MixItemView; var MixItemView, _ref;
MixItemView = (function(_super) {
MixItemView = (function(_super) {
__extends(MixItemView, _super); __extends(MixItemView, _super);
function MixItemView() { function MixItemView() {
this.doStart = __bind(this.doStart, this); this.doStart = __bind(this.doStart, this);
this.renderComments = __bind(this.renderComments, this); this.renderComments = __bind(this.renderComments, this);
this.renderGenres = __bind(this.renderGenres, this); this.renderGenres = __bind(this.renderGenres, this);
this.onRender = __bind(this.onRender, this); this.onRender = __bind(this.onRender, this);
this.initialize = __bind(this.initialize, this); _ref = MixItemView.__super__.constructor.apply(this, arguments);
this.initialize = __bind(this.initialize, this); return _ref;
return MixItemView.__super__.constructor.apply(this, arguments);
} }
MixItemView.prototype.template = _.template(Template); MixItemView.prototype.template = _.template(Template);
@@ -54,6 +50,7 @@
MixItemView.prototype.onRender = function() { MixItemView.prototype.onRender = function() {
var id, totalDuration, totalDurationText; var id, totalDuration, totalDurationText;
id = this.model.get('id'); id = this.model.get('id');
if (this.model.get('duration')) { if (this.model.get('duration')) {
totalDuration = moment.duration(this.model.get('duration'), "seconds"); totalDuration = moment.duration(this.model.get('duration'), "seconds");
@@ -74,6 +71,7 @@
MixItemView.prototype.renderGenres = function() { MixItemView.prototype.renderGenres = function() {
var el; var el;
el = this.el; el = this.el;
$.each(this.model.get("genre-list"), function(data) { $.each(this.model.get("genre-list"), function(data) {
$("#genre-list", el).append('<a href="/mixes/' + this.slug + '" class="label label-info arrowed-right arrowed-in">' + this.text + '</a>'); $("#genre-list", el).append('<a href="/mixes/' + this.slug + '" class="label label-info arrowed-right arrowed-in">' + this.text + '</a>');
@@ -84,6 +82,7 @@
MixItemView.prototype.renderComments = function() { MixItemView.prototype.renderComments = function() {
var comments; var comments;
comments = new CommentsCollection(); comments = new CommentsCollection();
comments.url = this.model.get("resource_uri") + "comments/"; comments.url = this.model.get("resource_uri") + "comments/";
comments.mix_id = this.model.id; comments.mix_id = this.model.id;
@@ -91,6 +90,7 @@
comments.fetch({ comments.fetch({
success: function(data) { success: function(data) {
var content; var content;
content = new CommentsListView({ content = new CommentsListView({
collection: comments collection: comments
}).render(); }).render();
@@ -139,6 +139,7 @@
MixItemView.prototype.mixFavourite = function() { MixItemView.prototype.mixFavourite = function() {
var app; var app;
console.log("MixItemView: favouriteMix"); console.log("MixItemView: favouriteMix");
app = require('app'); app = require('app');
vent.trigger("mix:favourite", this.model); vent.trigger("mix:favourite", this.model);
@@ -153,6 +154,7 @@
MixItemView.prototype.mixShare = function(e) { MixItemView.prototype.mixShare = function(e) {
var mode; var mode;
console.log("MixItemView: shareMix"); console.log("MixItemView: shareMix");
mode = $(e.currentTarget).data("mode"); mode = $(e.currentTarget).data("mode");
console.log("MixItemView: " + mode); console.log("MixItemView: " + mode);

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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(['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activityListView', 'views/widgets/nowPlayingView', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, vent, ActivityListView, NowPlayingView, Template) { define(['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activityListView', 'views/widgets/nowPlayingView', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, vent, ActivityListView, NowPlayingView, Template) {
var SidebarView; var SidebarView, _ref;
SidebarView = (function(_super) {
SidebarView = (function(_super) {
__extends(SidebarView, _super); __extends(SidebarView, _super);
function SidebarView() { function SidebarView() {
return SidebarView.__super__.constructor.apply(this, arguments); _ref = SidebarView.__super__.constructor.apply(this, arguments);
return _ref;
} }
SidebarView.prototype.template = _.template(Template); SidebarView.prototype.template = _.template(Template);
@@ -43,6 +44,7 @@
SidebarView.prototype.liveStarted = function() { SidebarView.prototype.liveStarted = function() {
var _this = this; var _this = this;
console.log("SidebarView: livePlay"); console.log("SidebarView: livePlay");
$.getJSON("ajax/live_now_playing/", function(data) { $.getJSON("ajax/live_now_playing/", function(data) {
$(_this.topRegion.el).show(); $(_this.topRegion.el).show();

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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', 'toastr', 'app.lib/editableView', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/UserEditView'], function(App, toastr, EditableView, moment, utils, Syphon, Template) { define(['app', 'toastr', 'app.lib/editableView', 'moment', 'utils', 'backbone.syphon', 'text!/tpl/UserEditView'], function(App, toastr, EditableView, moment, utils, Syphon, Template) {
var UserEditView; var UserEditView, _ref;
UserEditView = (function(_super) {
UserEditView = (function(_super) {
__extends(UserEditView, _super); __extends(UserEditView, _super);
function UserEditView() { function UserEditView() {
return UserEditView.__super__.constructor.apply(this, arguments); _ref = UserEditView.__super__.constructor.apply(this, arguments);
return _ref;
} }
UserEditView.prototype.template = _.template(Template); UserEditView.prototype.template = _.template(Template);
@@ -22,6 +23,7 @@
UserEditView.prototype.onRender = function() { UserEditView.prototype.onRender = function() {
var avatarType; var avatarType;
console.log("MixEditView: onRender"); console.log("MixEditView: onRender");
avatarType = this.model.get('avatar_type'); avatarType = this.model.get('avatar_type');
$('#avatar_' + avatarType, this.el).attr('checked', true); $('#avatar_' + avatarType, this.el).attr('checked', true);
@@ -43,6 +45,7 @@
UserEditView.prototype.selectAvatar = function(evt) { UserEditView.prototype.selectAvatar = function(evt) {
var type; var type;
type = $(evt.currentTarget).val(); type = $(evt.currentTarget).val();
this.model.set("avatar_type", type); this.model.set("avatar_type", type);
if (type === "custom") { if (type === "custom") {
@@ -54,12 +57,14 @@
UserEditView.prototype.saveChanges = function() { UserEditView.prototype.saveChanges = function() {
var data, ref; var data, ref;
data = Backbone.Syphon.serialize(this); data = Backbone.Syphon.serialize(this);
this.model.set(data); this.model.set(data);
ref = this; ref = this;
this._saveChanges({ this._saveChanges({
success: function() { success: function() {
var _this = this; var _this = this;
if (ref.model.get('avatar_type') === "custom") { if (ref.model.get('avatar_type') === "custom") {
$.ajaxFileUpload({ $.ajaxFileUpload({
url: "ajax/upload_avatar_image/", url: "ajax/upload_avatar_image/",

View File

@@ -1,22 +1,20 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__hasProp = {}.hasOwnProperty, __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; }; __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(['jquery', 'marionette', 'models/user/userCollection', 'views/user/userItemView', 'text!/tpl/UserListView'], function($, Marionette, UserCollection, UserItemView, Template) { define(['jquery', 'marionette', 'models/user/userCollection', 'views/user/userItemView', 'text!/tpl/UserListView'], function($, Marionette, UserCollection, UserItemView, Template) {
var UserListView; var UserListView, _ref;
UserListView = (function(_super) {
UserListView = (function(_super) {
__extends(UserListView, _super); __extends(UserListView, _super);
function UserListView() { function UserListView() {
this.doSearch = __bind(this.doSearch, this); this.doSearch = __bind(this.doSearch, this);
this._fetchCollection = __bind(this._fetchCollection, this); this._fetchCollection = __bind(this._fetchCollection, this);
this.initialize = __bind(this.initialize, this); _ref = UserListView.__super__.constructor.apply(this, arguments);
this.initialize = __bind(this.initialize, this); return _ref;
return UserListView.__super__.constructor.apply(this, arguments);
} }
UserListView.prototype.template = _.template(Template); UserListView.prototype.template = _.template(Template);
@@ -43,6 +41,7 @@
UserListView.prototype._fetchCollection = function(options) { UserListView.prototype._fetchCollection = function(options) {
var _this = this; var _this = this;
return this.collection.fetch({ return this.collection.fetch({
data: options, data: options,
success: function() { success: function() {
@@ -53,6 +52,7 @@
UserListView.prototype.doSearch = function() { UserListView.prototype.doSearch = function() {
var query; var query;
console.log("UserListView: doSearch"); console.log("UserListView: doSearch");
query = this.ui.searchText.val(); query = this.ui.searchText.val();
if (query) { if (query) {

View File

@@ -1,5 +1,4 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
/* /*
@license @license
@@ -15,14 +14,16 @@ Code provided under the BSD License:
__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; }; __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(["underscore", "marionette", "vent", "utils", "views/widgets/searchView", "views/notifications/notificationsListView", "text!/tpl/HeaderView"], function(_, Marionette, vent, utils, SearchView, NotificationsListView, Template) { define(["underscore", "marionette", "vent", "utils", "views/widgets/searchView", "views/notifications/notificationsListView", "text!/tpl/HeaderView"], function(_, Marionette, vent, utils, SearchView, NotificationsListView, Template) {
var HeaderView; var HeaderView, _ref;
HeaderView = (function(_super) { HeaderView = (function(_super) {
var NowrapRegion; var NowrapRegion;
__extends(HeaderView, _super); __extends(HeaderView, _super);
function HeaderView() { function HeaderView() {
return HeaderView.__super__.constructor.apply(this, arguments); _ref = HeaderView.__super__.constructor.apply(this, arguments);
return _ref;
} }
NowrapRegion = Marionette.Region.extend({ NowrapRegion = Marionette.Region.extend({

View File

@@ -1,16 +1,17 @@
// Generated by CoffeeScript 1.3.3 // Generated by CoffeeScript 1.6.2
(function() { (function() {
var __hasProp = {}.hasOwnProperty, 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; }; __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(['jquery', 'underscore', 'marionette', 'vent', 'text!/tpl/SearchView', 'text!/tpl/SearchResultView', 'lib/bootstrap-typeahead'], function($, _, Marionette, vent, Template, SearchResultView) { define(['jquery', 'underscore', 'marionette', 'vent', 'text!/tpl/SearchView', 'text!/tpl/SearchResultView', 'lib/bootstrap-typeahead'], function($, _, Marionette, vent, Template, SearchResultView) {
var SearchView; var SearchView, _ref;
SearchView = (function(_super) {
SearchView = (function(_super) {
__extends(SearchView, _super); __extends(SearchView, _super);
function SearchView() { function SearchView() {
return SearchView.__super__.constructor.apply(this, arguments); _ref = SearchView.__super__.constructor.apply(this, arguments);
return _ref;
} }
SearchView.prototype.template = _.template(Template); SearchView.prototype.template = _.template(Template);
@@ -22,6 +23,7 @@
SearchView.prototype.engine = { SearchView.prototype.engine = {
compile: function(template) { compile: function(template) {
var compiled; var compiled;
compiled = _.template(template); compiled = _.template(template);
return { return {
render: function(context) { render: function(context) {
@@ -33,6 +35,7 @@
SearchView.prototype.onShow = function() { SearchView.prototype.onShow = function() {
var t; var t;
if (typeof typeahead !== "undefined" && typeahead !== null) { if (typeof typeahead !== "undefined" && typeahead !== null) {
t = $('#search-text', this.el).typeahead({ t = $('#search-text', this.el).typeahead({
name: "search", name: "search",

View File

@@ -172,26 +172,26 @@ com.podnoms.player = {
this.timeDisplayLabel.animate({ top: 0, left: this.playHeadEl.position().left }); this.timeDisplayLabel.animate({ top: 0, left: this.playHeadEl.position().left });
}, },
startPlaying: function (options) { startPlaying: function (options) {
var ref = this; var that = this;
var currId = this.currentId; var currId = this.currentId;
this._destroyCurrent(function () { this._destroyCurrent(function () {
ref.currentSound = soundManager.createSound({ that.currentSound = soundManager.createSound({
url: ref.currentPath, url: that.currentPath,
id: "com.podnoms.player-" + currId.toString(), id: "com.podnoms.player-" + currId.toString(),
volume: com.podnoms.settings.volume, volume: com.podnoms.settings.volume,
whileloading: function () { whileloading: function () {
ref._whileLoading(); that._whileLoading();
}, },
whileplaying: function () { whileplaying: function () {
ref._whilePlaying(); that._whilePlaying();
} }
}); });
if (ref.currentSound) { if (that.currentSound) {
ref.play(); that.play();
if (options.success) if (options.success)
options.success(); options.success();
//create the floating time display label //create the floating time display label
ref._createTimeDisplayLabel(); that._createTimeDisplayLabel();
} }
else { else {
if (options.error) if (options.error)
@@ -210,18 +210,18 @@ com.podnoms.player = {
} }
}, },
playLive: function () { playLive: function () {
var ref = this; var that = this;
var args = arguments; var args = arguments;
this._destroyCurrent(function () { this._destroyCurrent(function () {
ref.currentSound = soundManager.createSound({ that.currentSound = soundManager.createSound({
id: 'com.podnoms.player-live', id: 'com.podnoms.player-live',
url: com.podnoms.settings.liveStreamRoot, url: com.podnoms.settings.liveStreamRoot,
volume: 50, volume: 50,
stream: true, stream: true,
useMovieStar: true useMovieStar: true
}); });
if (ref.currentSound) { if (that.currentSound) {
ref.currentSound.play(); that.currentSound.play();
args[0].success(); args[0].success();
} }
else { else {