From fab85c7e02402061501f77dcd2ce05ef7aa4efac Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 6 Aug 2013 12:33:44 +0100 Subject: [PATCH] Updated requirements.txt --- dss/settings.py | 1 + requirements.txt | 4 +++- static/js/app/appv2.js | 8 ++++++-- static/js/app/lib/controller.js | 18 ++++++++++++++---- .../notifications/notificationCollection.js | 11 +++++++---- static/js/app/models/user/userItem.js | 9 +++++---- static/js/app/views/user/userItemView.js | 10 +++++----- static/js/app/views/widgets/headerView.js | 9 +++++---- 8 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dss/settings.py b/dss/settings.py index 3cbaf1c..50093bf 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -176,6 +176,7 @@ INSTALLED_APPS = ( 'allauth.socialaccount.providers.twitter', 'allauth.socialaccount.providers.google', 'debug_toolbar', + 'django_jenkins', #'backbone_tastypie', ) diff --git a/requirements.txt b/requirements.txt index 9912f69..d2dc278 100755 --- a/requirements.txt +++ b/requirements.txt @@ -31,4 +31,6 @@ Werkzeug psycopg2 templated_emails htmlmin -django-htmlmin \ No newline at end of file +django-htmlmin +tastypie-msgpack +django-jenkins diff --git a/static/js/app/appv2.js b/static/js/app/appv2.js index c5a6bc0..49ac436 100755 --- a/static/js/app/appv2.js +++ b/static/js/app/appv2.js @@ -1,14 +1,15 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (function() { - define(['backbone', 'marionette', 'vent', 'utils', 'app.lib/social', 'app.lib/router', 'app.lib/panningRegion', 'app.lib/realtimeController', 'app.lib/audioController', 'models/user/userItem', 'models/mix/mixCollection', 'views/widgets/headerView', 'views/sidebar/sidebarView'], function(Backbone, Marionette, vent, utils, social, DssRouter, PanningRegion, RealtimeController, AudioController, UserItem, MixCollection, HeaderView, SidebarView) { var App, sidebarView; + App = new Marionette.Application(); App.audioController = new AudioController(); App.realtimeController = new RealtimeController(); App.realtimeController.startSocketIO(); App.vent.on("routing:started", function() { var enablePushState, pushState; + console.log("App(vent): routing:started"); enablePushState = true; pushState = !!(enablePushState && window.history && window.history.pushState); @@ -34,6 +35,7 @@ App.addInitializer(function() { $(document).on("click", "a[href]:not([data-bypass])", function(evt) { var href, root; + href = { prop: $(this).prop("href"), attr: $(this).attr("href") @@ -69,6 +71,7 @@ this.listenTo(vent, "user:follow", function(model) { var target, user, _this = this; + console.log("App(vent): user:follow"); user = new UserItem({ id: com.podnoms.settings.currentUser @@ -77,6 +80,7 @@ user.fetch({ success: function() { var f, newFollowers; + if (!model.get("is_following")) { newFollowers = user.get("following").concat([target]); user.save({ diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js index 914522a..c0ee8d0 100755 --- a/static/js/app/lib/controller.js +++ b/static/js/app/lib/controller.js @@ -1,16 +1,17 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (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(['app', 'marionette', 'vent', 'views/chat/chatView', 'models/mix/mixItem', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'models/user/userItem', 'views/user/userListView', 'views/user/userEditView'], function(App, Marionette, vent, ChatView, MixItem, MixListLayout, MixListView, MixDetailView, MixEditView, UserItem, UserListView, UserEditView) { - var DssController; - DssController = (function(_super) { + var DssController, _ref; + DssController = (function(_super) { __extends(DssController, _super); function DssController() { - return DssController.__super__.constructor.apply(this, arguments); + _ref = DssController.__super__.constructor.apply(this, arguments); + return _ref; } DssController.prototype.home = function() { @@ -21,6 +22,7 @@ DssController.prototype._showMixList = function() { var app; + app = require('app'); app.contentRegion.show(new MixListLayout()); return true; @@ -36,6 +38,7 @@ DssController.prototype.showMix = function(slug) { var app, mix; + console.log("Controller: showMix"); app = require('app'); mix = new MixItem({ @@ -54,6 +57,7 @@ DssController.prototype.uploadMix = function() { var app, mix; + console.log("Controller: mixUpload"); app = require('app'); mix = new MixItem({ @@ -70,6 +74,7 @@ DssController.prototype.editMix = function(slug) { var app, mix; + console.log("Controller: mixEdit"); app = require('app'); mix = new MixItem({ @@ -87,6 +92,7 @@ DssController.prototype.showChat = function() { var app; + console.log("Controller: showChat"); app = require('app'); return app.contentRegion.show(new ChatView()); @@ -94,6 +100,7 @@ DssController.prototype.showUserList = function() { var app; + console.log("Controller: showUserList"); app = require('app'); return app.contentRegion.show(new UserListView()); @@ -128,6 +135,7 @@ DssController.prototype.showUserFollowing = function(slug) { var app; + console.log("Controller: showUserFollowing"); app = require('app'); return app.contentRegion.show(new UserListView({ @@ -137,6 +145,7 @@ DssController.prototype.showUserFollowers = function(slug) { var app; + console.log("Controller: showUserFollowers"); app = require('app'); return app.contentRegion.show(new UserListView({ @@ -146,6 +155,7 @@ DssController.prototype.editUser = function() { var app, user; + console.log("Controller: editUser"); app = require('app'); user = new UserItem({ diff --git a/static/js/app/models/notifications/notificationCollection.js b/static/js/app/models/notifications/notificationCollection.js index 4af688e..0f6a331 100644 --- a/static/js/app/models/notifications/notificationCollection.js +++ b/static/js/app/models/notifications/notificationCollection.js @@ -1,16 +1,17 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (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(['backbone', 'vent', 'models/notifications/notificationItem', 'app.lib/backbone.dss.model.collection'], function(Backbone, vent, NotificationItem, DssCollection) { - var NotificationCollection; - NotificationCollection = (function(_super) { + var NotificationCollection, _ref; + NotificationCollection = (function(_super) { __extends(NotificationCollection, _super); function NotificationCollection() { - return NotificationCollection.__super__.constructor.apply(this, arguments); + _ref = NotificationCollection.__super__.constructor.apply(this, arguments); + return _ref; } NotificationCollection.prototype.model = NotificationItem; @@ -21,8 +22,10 @@ NotificationCollection.prototype.initialize = function() { var _this = this; + return this.listenTo(vent, "model:notification:new", function(url) { var item; + console.log("NotificationCollection: notification:new"); item = new NotificationItem(); return item.fetch({ diff --git a/static/js/app/models/user/userItem.js b/static/js/app/models/user/userItem.js index 4338835..99ebecc 100755 --- a/static/js/app/models/user/userItem.js +++ b/static/js/app/models/user/userItem.js @@ -1,16 +1,17 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (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(['app.lib/backbone.dss.model'], function(DssModel) { - var UserItem; - UserItem = (function(_super) { + var UserItem, _ref; + UserItem = (function(_super) { __extends(UserItem, _super); function UserItem() { - return UserItem.__super__.constructor.apply(this, arguments); + _ref = UserItem.__super__.constructor.apply(this, arguments); + return _ref; } UserItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "user/"; diff --git a/static/js/app/views/user/userItemView.js b/static/js/app/views/user/userItemView.js index 55b9717..14b734a 100755 --- a/static/js/app/views/user/userItemView.js +++ b/static/js/app/views/user/userItemView.js @@ -1,18 +1,18 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (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', 'marionette', 'vent', 'text!/tpl/UserListItemView'], function(App, moment, Marionette, vent, Template) { - var UserItemView; - UserItemView = (function(_super) { + var UserItemView, _ref; + UserItemView = (function(_super) { __extends(UserItemView, _super); function UserItemView() { - this.initialize = __bind(this.initialize, this); - return UserItemView.__super__.constructor.apply(this, arguments); + this.initialize = __bind(this.initialize, this); _ref = UserItemView.__super__.constructor.apply(this, arguments); + return _ref; } UserItemView.prototype.template = _.template(Template); diff --git a/static/js/app/views/widgets/headerView.js b/static/js/app/views/widgets/headerView.js index d1d9ab0..1a5bfab 100644 --- a/static/js/app/views/widgets/headerView.js +++ b/static/js/app/views/widgets/headerView.js @@ -1,5 +1,4 @@ -// Generated by CoffeeScript 1.3.3 - +// Generated by CoffeeScript 1.6.2 /* @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; }; 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) { var NowrapRegion; __extends(HeaderView, _super); function HeaderView() { - return HeaderView.__super__.constructor.apply(this, arguments); + _ref = HeaderView.__super__.constructor.apply(this, arguments); + return _ref; } NowrapRegion = Marionette.Region.extend({