'+
- Diaspora.I18n.t('profile.ignoring', {name: this.model.get('name')}) +
- '
');
+ if(!this.model.has("profile")){
return false;
}
@@ -96,14 +99,13 @@ app.pages.Profile = app.views.Base.extend({
},
blockPerson: function() {
- if( !confirm(Diaspora.I18n.t('ignore_user')) ) return;
+ if(!confirm(Diaspora.I18n.t("ignore_user"))){
+ return;
+ }
var block = this.model.block();
block.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('ignore_failed')
- });
+ app.flashMessages.error(Diaspora.I18n.t("ignore_failed"));
});
return false;
@@ -112,22 +114,18 @@ app.pages.Profile = app.views.Base.extend({
unblockPerson: function() {
var block = this.model.unblock();
block.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18.t('unblock_failed')
- });
+ app.flashMessages.error(Diaspora.I18.t("unblock_failed"));
});
return false;
},
reload: function() {
- this.$('#profile').addClass('loading');
+ this.$("#profile").addClass("loading");
this.model.fetch();
},
_done: function() {
- this.$('#profile').removeClass('loading');
+ this.$("#profile").removeClass("loading");
}
});
// @license-end
-
diff --git a/app/assets/javascripts/app/pages/settings.js b/app/assets/javascripts/app/pages/settings.js
index c111d5681..517d17663 100644
--- a/app/assets/javascripts/app/pages/settings.js
+++ b/app/assets/javascripts/app/pages/settings.js
@@ -1,7 +1,9 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.pages.Settings = Backbone.View.extend({
initialize: function() {
- $(".settings_visibilty").tooltip({placement: "top"});
+ $(".settings-visibility").tooltip({placement: "top"});
+ $(".profile-visibility-hint").tooltip({placement: "top"});
+ $("[name='profile[public_details]']").bootstrapSwitch();
}
});
// @license-end
diff --git a/app/assets/javascripts/app/pages/single-post-viewer.js b/app/assets/javascripts/app/pages/single-post-viewer.js
index 0eb0cc0d8..c5a30f1c9 100644
--- a/app/assets/javascripts/app/pages/single-post-viewer.js
+++ b/app/assets/javascripts/app/pages/single-post-viewer.js
@@ -12,16 +12,6 @@ app.pages.SinglePostViewer = app.views.Base.extend({
this.model = new app.models.Post({ id : gon.post.id });
this.model.preloadOrFetch().done(_.bind(this.initViews, this));
this.model.interactions.fetch(); //async, yo, might want to throttle this later.
- this.setupLightbox();
- },
-
- setupLightbox : function(){
- this.lightbox = Diaspora.BaseWidget.instantiate("Lightbox");
- this.lightbox.set({
- imageParent: '.photo_attachments',
- imageSelector: 'img.stream-photo'
- });
- this.$el.delegate("a.stream-photo-link", "click", this.lightbox.lightboxImageClicked);
},
initViews : function() {
@@ -37,7 +27,6 @@ app.pages.SinglePostViewer = app.views.Base.extend({
//... and converts html to plain text
document.title = $('').html(html_title).text();
}
- },
-
+ }
});
// @license-end
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index 2fefe63a8..160123505 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -2,31 +2,34 @@
app.Router = Backbone.Router.extend({
routes: {
- "help/:section": "help",
- "help/": "help",
- "help": "help",
- "contacts": "contacts",
- "conversations": "conversations",
- "user/edit": "settings",
- "users/sign_up": "registration",
-
- "posts/:id": "singlePost",
- "p/:id": "singlePost",
-
- "activity": "stream",
- "stream": "stream",
- "aspects": "aspects",
- "commented": "stream",
- "liked": "stream",
- "mentions": "stream",
- "public": "stream",
- "followed_tags": "followed_tags",
- "tags/:name": "followed_tags",
- "people/:id/photos": "photos",
- "people/:id/contacts": "profile",
-
- "people/:id": "profile",
- "u/:name": "profile"
+ "activity(/)": "stream",
+ "admin/pods(/)": "adminPods",
+ "admins/dashboard(/)": "adminDashboard",
+ "aspects(/)": "aspects",
+ "commented(/)": "stream",
+ "community_spotlight(/)": "spotlight",
+ "contacts(/)": "contacts",
+ "conversations(/)": "conversations",
+ "followed_tags(/)": "followed_tags",
+ "getting_started(/)": "gettingStarted",
+ "help(/)": "help",
+ "help/:section(/)": "help",
+ "liked(/)": "stream",
+ "mentions(/)": "stream",
+ "notifications(/)": "notifications",
+ "p/:id(/)": "singlePost",
+ "people(/)": "peopleSearch",
+ "people/:id(/)": "profile",
+ "people/:id/contacts(/)": "profile",
+ "people/:id/photos(/)": "photos",
+ "posts/:id(/)": "singlePost",
+ "profile/edit(/)": "settings",
+ "public(/)": "stream",
+ "stream(/)": "stream",
+ "tags/:name(/)": "followed_tags",
+ "u/:name(/)": "profile",
+ "user/edit(/)": "settings",
+ "users/sign_up(/)": "registration"
},
initialize: function() {
@@ -36,19 +39,55 @@ app.Router = Backbone.Router.extend({
this.route(/^bookmarklet(?:\?(.*))?/, "bookmarklet");
},
- help: function(section) {
- app.help = new app.views.Help();
- $("#help").prepend(app.help.el);
- app.help.render(section);
+ adminDashboard: function() {
+ app.page = new app.pages.AdminDashboard();
},
- contacts: function() {
+ adminPods: function() {
+ this.renderPage(function() {
+ return new app.pages.AdminPods({
+ el: $("#pod-list")
+ });
+ });
+ },
+
+ aspects: function() {
+ app.aspectSelections = app.aspectSelections ||
+ new app.collections.AspectSelections(app.currentUser.get("aspects"));
+ this.aspectsList = this.aspectsList || new app.views.AspectsList({collection: app.aspectSelections});
+ this.aspectsList.render();
+ /* eslint-disable camelcase */
+ this.aspects_stream();
+ /* eslint-enable camelcase */
+ },
+
+ /* eslint-disable camelcase */
+ aspects_stream: function() {
+ /* eslint-enable camelcase */
+ var ids = app.aspectSelections.selectedGetAttribute("id");
+ /* eslint-disable camelcase */
+ app.stream = new app.models.StreamAspects([], {aspects_ids: ids});
+ /* eslint-enable camelcase */
+ app.stream.fetch();
+ this._initializeStreamView();
+ app.publisher.setSelectedAspects(ids);
+ },
+
+ bookmarklet: function() {
+ var contents = (window.gon) ? gon.preloads.bookmarklet : {};
+ app.bookmarklet = new app.views.Bookmarklet(
+ _.extend({}, {el: $("#bookmarklet")}, contents)
+ ).render();
+ },
+
+ contacts: function(params) {
app.aspect = new app.models.Aspect(gon.preloads.aspect);
- app.contacts = new app.collections.Contacts(app.parsePreload('contacts'));
+ this._loadContacts();
var stream = new app.views.ContactStream({
collection: app.contacts,
- el: $('.stream.contacts #contact_stream'),
+ el: $(".stream.contacts #contact_stream"),
+ urlParams: params
});
app.page = new app.pages.Contacts({stream: stream});
@@ -58,6 +97,77 @@ app.Router = Backbone.Router.extend({
app.conversations = new app.views.Conversations();
},
+ /* eslint-disable camelcase */
+ followed_tags: function(name) {
+ /* eslint-enable camelcase */
+ this.stream();
+
+ app.tagFollowings = new app.collections.TagFollowings();
+ this.followedTagsView = new app.views.TagFollowingList({collection: app.tagFollowings});
+ $("#tags_list").replaceWith(this.followedTagsView.render().el);
+ this.followedTagsView.setupAutoSuggest();
+
+ app.tagFollowings.reset(gon.preloads.tagFollowings);
+
+ if (name) {
+ var followedTagsAction = new app.views.TagFollowingAction(
+ {tagText: decodeURIComponent(name).toLowerCase()}
+ );
+ $("#author_info").prepend(followedTagsAction.render().el);
+ app.tags = new app.views.Tags({hashtagName: name});
+ }
+ this._hideInactiveStreamLists();
+ },
+
+ gettingStarted: function() {
+ this.renderPage(function() {
+ return new app.pages.GettingStarted({inviter: new app.models.Person(app.parsePreload("inviter"))});
+ });
+ },
+
+ help: function(section) {
+ app.help = new app.views.Help();
+ $("#help").prepend(app.help.el);
+ app.help.render(section);
+ },
+
+ notifications: function() {
+ this._loadContacts();
+ this.renderAspectMembershipDropdowns($(document));
+ new app.views.Notifications({el: "#notifications_container"});
+ },
+
+ peopleSearch: function() {
+ this._loadContacts();
+ this.renderAspectMembershipDropdowns($(document));
+ $(".invitations-link").click(function() {
+ app.helpers.showModal("#invitationsModal");
+ });
+ },
+
+ photos: function(guid) {
+ this._loadContacts();
+ this.renderPage(function() {
+ return new app.pages.Profile({
+ /* eslint-disable camelcase */
+ person_id: guid,
+ /* eslint-enable camelcase */
+ el: $("body > #profile_container"),
+ streamCollection: app.collections.Photos,
+ streamView: app.views.Photos
+ });
+ });
+ },
+
+ profile: function() {
+ this._loadContacts();
+ this.renderPage(function() {
+ return new app.pages.Profile({
+ el: $("body > #profile_container")
+ });
+ });
+ },
+
registration: function() {
app.page = new app.pages.Registration();
},
@@ -66,111 +176,71 @@ app.Router = Backbone.Router.extend({
app.page = new app.pages.Settings();
},
- singlePost : function(id) {
- this.renderPage(function(){ return new app.pages.SinglePostViewer({ id: id })});
+ singlePost: function(id) {
+ this.renderPage(function() { return new app.pages.SinglePostViewer({id: id}); });
},
- renderPage : function(pageConstructor){
- app.page && app.page.unbind && app.page.unbind(); //old page might mutate global events $(document).keypress, so unbind before creating
- app.page = pageConstructor(); //create new page after the world is clean (like that will ever happen)
- app.page.render();
-
- if( !$.contains(document, app.page.el) ) {
- // view element isn't already attached to the DOM, insert it
- $("#container").empty().append(app.page.el);
- }
+ spotlight: function() {
+ $("#invitations-button").click(function() {
+ app.helpers.showModal("#invitationsModal");
+ });
},
- stream : function() {
+ stream: function() {
app.stream = new app.models.Stream();
app.stream.fetch();
this._initializeStreamView();
},
- photos : function(guid) {
- this.renderPage(function() {
- return new app.pages.Profile({
- person_id: guid,
- el: $('body > .container-fluid'),
- streamCollection: app.collections.Photos,
- streamView: app.views.Photos
- });
- });
- },
-
- followed_tags : function(name) {
- this.stream();
-
- app.tagFollowings = new app.collections.TagFollowings();
- this.followedTagsView = new app.views.TagFollowingList({collection: app.tagFollowings});
- $("#tags_list").replaceWith(this.followedTagsView.render().el);
- this.followedTagsView.setupAutoSuggest();
-
- app.tagFollowings.reset(gon.preloads.tagFollowings);
-
- if(name) {
- var followedTagsAction = new app.views.TagFollowingAction(
- {tagText: decodeURIComponent(name).toLowerCase()}
- );
- $("#author_info").prepend(followedTagsAction.render().el);
- app.tags = new app.views.Tags({hashtagName: name});
- }
- this._hideInactiveStreamLists();
- },
-
- aspects: function() {
- app.aspects = app.aspects || new app.collections.Aspects(app.currentUser.get("aspects"));
- this.aspectsList = this.aspectsList || new app.views.AspectsList({ collection: app.aspects });
- this.aspectsList.render();
- this.aspects_stream();
- },
-
- aspects_stream : function(){
- var ids = app.aspects.selectedAspects('id');
- app.stream = new app.models.StreamAspects([], { aspects_ids: ids });
- app.stream.fetch();
- this._initializeStreamView();
- app.publisher.setSelectedAspects(ids);
- },
-
- bookmarklet: function() {
- var contents = (window.gon) ? gon.preloads.bookmarklet : {};
- app.bookmarklet = new app.views.Bookmarklet(
- _.extend({}, {el: $('#bookmarklet')}, contents)
- ).render();
- },
-
- profile: function() {
- this.renderPage(function() { return new app.pages.Profile({
- el: $('body > .container-fluid')
- }); });
- },
-
_hideInactiveStreamLists: function() {
- if(this.aspectsList && Backbone.history.fragment !== "aspects") {
+ if (this.aspectsList && Backbone.history.fragment !== "aspects") {
this.aspectsList.hideAspectsList();
}
- if(this.followedTagsView && Backbone.history.fragment !== "followed_tags") {
+ if (this.followedTagsView && Backbone.history.fragment !== "followed_tags") {
this.followedTagsView.hideFollowedTags();
}
},
_initializeStreamView: function() {
- if(app.page) {
+ if (app.page) {
app.page.unbindInfScroll();
app.page.remove();
}
- app.page = new app.views.Stream({model : app.stream});
- app.publisher = app.publisher || new app.views.Publisher({collection : app.stream.items});
+ app.page = new app.views.Stream({model: app.stream});
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
-
- var streamFacesView = new app.views.StreamFaces({collection : app.stream.items});
+ if ($("#publisher").length !== 0) {
+ app.publisher = app.publisher || new app.views.Publisher({collection: app.stream.items});
+ }
$("#main_stream").html(app.page.render().el);
- $("#selected_aspect_contacts .content").html(streamFacesView.render().el);
this._hideInactiveStreamLists();
+ },
+
+ _loadContacts: function() {
+ app.contacts = new app.collections.Contacts(app.parsePreload("contacts"));
+ },
+
+ renderAspectMembershipDropdowns: function($context) {
+ $context.find(".aspect_membership_dropdown.placeholder").each(function() {
+ var personId = $(this).data("personId");
+ var view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person});
+ $(this).html(view.render().$el);
+ });
+ },
+
+ renderPage: function(pageConstructor) {
+ // old page might mutate global events $(document).keypress, so unbind before creating
+ app.page && app.page.unbind && app.page.unbind();
+ // create new page after the world is clean (like that will ever happen)
+ app.page = pageConstructor();
+ app.page.render();
+
+ if (!$.contains(document, app.page.el)) {
+ // view element isn"t already attached to the DOM, insert it
+ $("#container").empty().append(app.page.el);
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index 1d787462a..ebd8901a9 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -61,16 +61,20 @@ app.views.Base = Backbone.View.extend({
// add placeholder support for old browsers
this.$("input, textarea").placeholder();
+ // init autosize plugin
+ autosize(this.$("textarea"));
+
this.postRenderTemplate();
},
- postRenderTemplate : $.noop, //hella callbax yo
+ postRenderTemplate: $.noop, //hella callbax yo
renderSubviews : function(){
var self = this;
_.each(this.subviews, function(property, selector){
var view = _.isFunction(self[property]) ? self[property]() : self[property];
- if(view) {
+ if (view && self.$(selector).length > 0) {
+ self.$(selector).empty();
self.$(selector).html(view.render().el);
view.delegateEvents();
}
@@ -116,38 +120,30 @@ app.views.Base = Backbone.View.extend({
var report = new app.models.Report();
report.save(data, {
success: function() {
- Diaspora.page.flashMessages.render({
- success: true,
- notice: Diaspora.I18n.t('report.status.created')
- });
+ app.flashMessages.success(Diaspora.I18n.t("report.status.created"));
},
error: function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('report.status.exists')
- });
+ app.flashMessages.error(Diaspora.I18n.t("report.status.exists"));
}
});
},
+ destroyConfirmMsg: function() { return Diaspora.I18n.t("confirm_dialog"); },
+
destroyModel: function(evt) {
evt && evt.preventDefault();
var self = this;
- var url = this.model.urlRoot + '/' + this.model.id;
+ var url = this.model.urlRoot + "/" + this.model.id;
- if (confirm(Diaspora.I18n.t("confirm_dialog"))) {
- this.$el.addClass('deleting');
+ if( confirm(_.result(this, "destroyConfirmMsg")) ) {
+ this.$el.addClass("deleting");
this.model.destroy({ url: url })
.done(function() {
self.remove();
})
.fail(function() {
- self.$el.removeClass('deleting');
- var flash = new Diaspora.Widgets.FlashMessages();
- flash.render({
- success: false,
- notice: Diaspora.I18n.t('failed_to_remove')
- });
+ self.$el.removeClass("deleting");
+ app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
});
}
},
@@ -161,7 +157,6 @@ app.views.Base = Backbone.View.extend({
});
app.views.StaticContentView = app.views.Base.extend({
-
initialize : function(options) {
this.templateName = options.templateName;
this.data = options.data;
diff --git a/app/assets/javascripts/app/views/aspect_create_view.js b/app/assets/javascripts/app/views/aspect_create_view.js
index 4ef77c808..8c7d030f9 100644
--- a/app/assets/javascripts/app/views/aspect_create_view.js
+++ b/app/assets/javascripts/app/views/aspect_create_view.js
@@ -4,24 +4,23 @@ app.views.AspectCreate = app.views.Base.extend({
templateName: "aspect_create_modal",
events: {
- "click .btn.creation": "createAspect"
+ "click .btn.btn-primary": "createAspect",
+ "keypress input#aspect_name": "inputKeypress"
},
initialize: function(opts) {
- this._personId = _.has(opts, "personId") ? opts.personId : null;
+ if (opts && opts.person) {
+ this.person = opts.person;
+ this._personId = opts.person.id;
+ }
},
presenter: function() {
return _.extend(this.defaultPresenter(), {
- addPersonId: this._personId !== null,
personId : this._personId
});
},
- postRenderTemplate: function() {
- this.modal = this.$(".modal");
- },
-
_contactsVisible: function() {
return this.$("#aspect_contacts_visible").is(":checked");
},
@@ -30,34 +29,59 @@ app.views.AspectCreate = app.views.Base.extend({
return this.$("#aspect_name").val();
},
+ inputKeypress: function(evt) {
+ if(evt.which === Keycodes.ENTER) {
+ evt.preventDefault();
+ this.createAspect();
+ }
+ },
+
+ postRenderTemplate: function() {
+ this.$(".modal").on("hidden.bs.modal", null, this, function(e) {
+ e.data.ensureEventsOrder();
+ });
+ },
+
createAspect: function() {
- var aspect = new app.models.Aspect({
- "person_id": this._personId,
+ this._eventsCounter = 0;
+
+ this.$(".modal").modal("hide");
+
+ this.listenToOnce(app.aspects, "sync", function(response) {
+ var aspectName = response.get("name"),
+ membership = response.get("aspect_membership");
+
+ this._newAspectId = response.get("id");
+
+ if (membership) {
+ if (!this.person.contact) {
+ this.person.contact = new app.models.Contact();
+ }
+ this.person.contact.aspectMemberships.add([membership]);
+ }
+
+ this.ensureEventsOrder();
+ app.flashMessages.success(Diaspora.I18n.t("aspects.create.success", {"name": aspectName}));
+ });
+
+ this.listenToOnce(app.aspects, "error", function() {
+ app.flashMessages.error(Diaspora.I18n.t("aspects.create.failure"));
+ this.stopListening(app.aspects, "sync");
+ });
+
+ app.aspects.create({
+ "person_id": this._personId || null,
"name": this._name(),
"contacts_visible": this._contactsVisible()
});
+ },
- var self = this;
- aspect.on("sync", function(response) {
- var aspectId = response.get("id"),
- aspectName = response.get("name");
-
- self.modal.modal("hide");
- app.events.trigger("aspect:create", aspectId);
- Diaspora.page.flashMessages.render({
- "success": true,
- "notice": Diaspora.I18n.t("aspects.create.success", {"name": aspectName})
- });
- });
-
- aspect.on("error", function() {
- self.modal.modal("hide");
- Diaspora.page.flashMessages.render({
- "success": false,
- "notice": Diaspora.I18n.t("aspects.create.failure")
- });
- });
- return aspect.save();
+ // ensure that we trigger the aspect:create event only after both hidden.bs.modal and and aspects sync happens
+ ensureEventsOrder: function() {
+ this._eventsCounter++;
+ if (this._eventsCounter > 1) {
+ app.events.trigger("aspect:create", this._newAspectId);
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/aspect_membership_view.js b/app/assets/javascripts/app/views/aspect_membership_view.js
index 4d8d52367..30529837e 100644
--- a/app/assets/javascripts/app/views/aspect_membership_view.js
+++ b/app/assets/javascripts/app/views/aspect_membership_view.js
@@ -1,7 +1,5 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-//= require ./aspects_dropdown_view
-
/**
* this view lets the user (de-)select aspect memberships in the context
* of another users profile or the contact page.
@@ -9,90 +7,120 @@
* updates to the list of aspects are immediately propagated to the server, and
* the results are dislpayed as flash messages.
*/
-app.views.AspectMembership = app.views.AspectsDropdown.extend({
+app.views.AspectMembership = app.views.Base.extend({
+ templateName: "aspect_membership_dropdown",
+ className: "btn-group aspect_dropdown aspect_membership_dropdown",
- events: {
- "click ul.aspect_membership.dropdown-menu > li.aspect_selector": "_clickHandler",
- "keypress ul.aspect_membership.dropdown-menu > li.aspect_selector": "_clickHandler",
- "click ul.aspect_membership.dropdown-menu > li.newItem": "showModal"
+ subviews: {
+ ".newAspectContainer": "aspectCreateView"
},
- initialize: function() {
+ events: {
+ "click ul.aspect_membership.dropdown-menu > li.aspect_selector"
+ : "_clickHandler",
+ "keypress ul.aspect_membership.dropdown-menu > li.aspect_selector"
+ : "_clickHandler"
+ },
+
+ initialize: function(opts) {
+ _.extend(this, opts);
this.list_item = null;
this.dropdown = null;
- if (this.$(".newAspectContainer").length > 0) {
- this.aspectCreateView = new app.views.AspectCreate({
- el: this.$(".newAspectContainer"),
- personId: this.$("ul.dropdown-menu").data("person_id")
- });
- this.aspectCreateView.render();
- }
+ },
+
+ presenter: function() {
+ var aspectMembershipsLength = this.person.contact ? this.person.contact.aspectMemberships.length : 0;
+
+ return _.extend(this.defaultPresenter(), {
+ aspects: this.aspectsPresenter(),
+ dropdownMayCreateNewAspect: this.dropdownMayCreateNewAspect
+ }, aspectMembershipsLength === 0 ? {
+ extraButtonClass: "btn-default",
+ noAspectIsSelected: true
+ } : { // this.contact.aspectMemberships.length > 0
+ aspectMembershipsLength: aspectMembershipsLength,
+ allAspectsAreSelected: aspectMembershipsLength === app.aspects.length,
+ onlyOneAspectIsSelected: aspectMembershipsLength === 1,
+ firstMembershipName: this.person.contact.aspectMemberships.at(0).get("aspect").name,
+ extraButtonClass: "btn-success"
+ });
+ },
+
+ aspectsPresenter: function() {
+ return _.map(app.aspects.models, function(aspect) {
+ return _.extend(
+ this.person.contact ?
+ {membership: this.person.contact.aspectMemberships.findByAspectId(aspect.attributes.id)} : {},
+ aspect.attributes // id, name
+ );
+ }, this);
+ },
+
+ aspectCreateView: function() {
+ return new app.views.AspectCreate({
+ person: this.person
+ });
},
// decide what to do when clicked
// -> addMembership
// -> removeMembership
_clickHandler: function(evt) {
- var promise = null;
this.list_item = $(evt.target).closest('li.aspect_selector');
this.dropdown = this.list_item.parent();
this.list_item.addClass('loading');
- if( this.list_item.is('.selected') ) {
- var membership_id = this.list_item.data('membership_id');
- promise = this.removeMembership(membership_id);
+ if (this.list_item.is(".selected")) {
+ this.removeMembership(this.list_item.data("membership_id"));
} else {
- var aspect_id = this.list_item.data('aspect_id');
- var person_id = this.dropdown.data('person_id');
- promise = this.addMembership(person_id, aspect_id);
+ this.addMembership(this.list_item.data("aspect_id"));
}
- promise && promise.always(function() {
- // trigger a global event
- app.events.trigger('aspect_membership:update');
- });
-
return false; // stop the event
},
// return the (short) name of the person associated with the current dropdown
_name: function() {
- return this.dropdown.data('person-short-name');
+ return this.person.name || this.person.get("name");
+ },
+
+ _personId: function() {
+ return this.person.id;
},
// create a membership for the given person in the given aspect
- addMembership: function(person_id, aspect_id) {
- var aspect_membership = new app.models.AspectMembership({
- 'person_id': person_id,
- 'aspect_id': aspect_id
+ addMembership: function(aspectId) {
+ if (!this.person.contact) {
+ this.person.contact = new app.models.Contact();
+ }
+
+ this.listenToOnce(this.person.contact.aspectMemberships, "sync", this._successSaveCb);
+ this.listenToOnce(this.person.contact.aspectMemberships, "error", function() {
+ this._displayError('aspect_dropdown.error');
});
- aspect_membership.on('sync', this._successSaveCb, this);
- aspect_membership.on('error', function() {
- this._displayError('aspect_dropdown.error');
- }, this);
-
- return aspect_membership.save();
+ return this.person.contact.aspectMemberships.create({"aspect_id": aspectId, "person_id": this._personId()});
},
- _successSaveCb: function(aspect_membership) {
- var aspect_id = aspect_membership.get('aspect_id');
- var membership_id = aspect_membership.get('id');
- var li = this.dropdown.find('li[data-aspect_id="'+aspect_id+'"]');
+ _successSaveCb: function(aspectMembership) {
+ var aspectId = aspectMembership.get("aspect_id"),
+ startSharing = false;
// the user didn't have this person in any aspects before, congratulate them
// on their newly found friendship ;)
- if( this.dropdown.find('li.selected').length === 0 ) {
- var msg = Diaspora.I18n.t('aspect_dropdown.started_sharing_with', { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':true, 'notice':msg });
+ if( this.dropdown.find("li.selected").length === 0 ) {
+ var msg = Diaspora.I18n.t("aspect_dropdown.started_sharing_with", { "name": this._name() });
+ startSharing = true;
+ app.flashMessages.success(msg);
}
- li.attr('data-membership_id', membership_id) // just to be sure...
- .data('membership_id', membership_id);
-
- this.updateSummary(li);
- this._done();
+ app.events.trigger("aspect_membership:create", {
+ membership: {aspectId: aspectId, personId: this._personId()},
+ startSharing: startSharing
+ });
+ this.render();
+ app.events.trigger("aspect_membership:update");
},
// show an error flash msg
@@ -101,39 +129,39 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({
this.dropdown.closest('.aspect_membership_dropdown').removeClass('open'); // close the dropdown
var msg = Diaspora.I18n.t(msg_id, { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':msg });
+ app.flashMessages.error(msg);
},
// remove the membership with the given id
- removeMembership: function(membership_id) {
- var aspect_membership = new app.models.AspectMembership({
- 'id': membership_id
+ removeMembership: function(membershipId) {
+ var membership = this.person.contact.aspectMemberships.get(membershipId);
+ this.listenToOnce(membership, "sync", this._successDestroyCb);
+ this.listenToOnce(membership, "error", function() {
+ this._displayError("aspect_dropdown.error_remove");
});
- aspect_membership.on('sync', this._successDestroyCb, this);
- aspect_membership.on('error', function() {
- this._displayError('aspect_dropdown.error_remove');
- }, this);
-
- return aspect_membership.destroy();
+ return membership.destroy();
},
- _successDestroyCb: function(aspect_membership) {
- var membership_id = aspect_membership.get('id');
- var li = this.dropdown.find('li[data-membership_id="'+membership_id+'"]');
-
- li.removeAttr('data-membership_id')
- .removeData('membership_id');
- this.updateSummary(li);
+ _successDestroyCb: function(aspectMembership) {
+ var membershipId = aspectMembership.get("id"),
+ aspectId = aspectMembership.get("aspect").id,
+ stopSharing = false;
+ this.render();
// we just removed the last aspect, inform the user with a flash message
// that he is no longer sharing with that person
- if( this.dropdown.find('li.selected').length === 0 ) {
- var msg = Diaspora.I18n.t('aspect_dropdown.stopped_sharing_with', { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':true, 'notice':msg });
+ if (this.$el.find("li.selected").length === 0) {
+ var msg = Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", { "name": this._name() });
+ stopSharing = true;
+ app.flashMessages.success(msg);
}
- this._done();
+ app.events.trigger("aspect_membership:destroy", {
+ membership: {aspectId: aspectId, personId: this._personId()},
+ stopSharing: stopSharing
+ });
+ app.events.trigger("aspect_membership:update");
},
// cleanup tasks after aspect selection
@@ -142,15 +170,5 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({
this.list_item.removeClass('loading');
}
},
-
- // refresh the button text to reflect the current aspect selection status
- updateSummary: function(target) {
- this._toggleCheckbox(target);
- this._updateButton('green');
- },
-
- showModal: function() {
- this.$("#newAspectModal").modal("show");
- }
});
// @license-end
diff --git a/app/assets/javascripts/app/views/aspect_view.js b/app/assets/javascripts/app/views/aspect_view.js
index 66cc4a945..69367a6eb 100644
--- a/app/assets/javascripts/app/views/aspect_view.js
+++ b/app/assets/javascripts/app/views/aspect_view.js
@@ -8,7 +8,7 @@ app.views.Aspect = app.views.Base.extend({
className: 'hoverable',
events: {
- 'click .entypo.check+a': 'toggleAspect'
+ "click .aspect-item": "toggleAspect"
},
toggleAspect: function(evt) {
diff --git a/app/assets/javascripts/app/views/aspects_dropdown_view.js b/app/assets/javascripts/app/views/aspects_dropdown_view.js
index 70e446704..ae9d7d897 100644
--- a/app/assets/javascripts/app/views/aspects_dropdown_view.js
+++ b/app/assets/javascripts/app/views/aspects_dropdown_view.js
@@ -1,6 +1,6 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-/*
+/*
* Aspects view for the publishers aspect dropdown and the aspect membership dropdown.
*/
app.views.AspectsDropdown = app.views.Base.extend({
@@ -31,7 +31,7 @@ app.views.AspectsDropdown = app.views.Base.extend({
var button = this.$('.btn.dropdown-toggle'),
selectedAspects = this.$(".dropdown-menu > li.selected").length,
buttonText;
-
+
if (selectedAspects === 0) {
button.removeClass(inAspectClass).addClass('btn-default');
buttonText = Diaspora.I18n.t("aspect_dropdown.select_aspects");
diff --git a/app/assets/javascripts/app/views/aspects_list_view.js b/app/assets/javascripts/app/views/aspects_list_view.js
index c0e5646f7..488863d88 100644
--- a/app/assets/javascripts/app/views/aspects_list_view.js
+++ b/app/assets/javascripts/app/views/aspects_list_view.js
@@ -15,7 +15,6 @@ app.views.AspectsList = app.views.Base.extend({
initialize: function() {
this.collection.on("change", this.toggleSelector, this);
- this.collection.on("change", this.updateStreamTitle, this);
this.collection.on("aspectStreamFetched", this.updateAspectList, this);
app.events.on("aspect:create", function(id) { window.location = "/contacts?a_id=" + id });
},
@@ -26,12 +25,11 @@ app.views.AspectsList = app.views.Base.extend({
postRenderTemplate: function() {
this.collection.each(this.appendAspect, this);
- this.updateStreamTitle();
this.toggleSelector();
},
appendAspect: function(aspect) {
- $("#aspects_list > *:last").before(new app.views.Aspect({
+ $("#aspects_list > .hoverable:last").before(new app.views.Aspect({
model: aspect, attributes: {'data-aspect_id': aspect.get('id')}
}).render().el);
},
@@ -58,17 +56,13 @@ app.views.AspectsList = app.views.Base.extend({
}
},
- updateStreamTitle: function() {
- $('.stream_title').text(this.collection.toSentence());
- },
-
updateAspectList: function() {
this.collection.each(function(aspect) {
- var element = this.$("li[data-aspect_id="+aspect.get('id')+"]");
- if (aspect.get('selected')) {
- element.find('.entypo.check').addClass('selected');
+ var element = this.$("li[data-aspect_id="+aspect.get("id")+"]");
+ if (aspect.get("selected")) {
+ element.find(".entypo-check").addClass("selected");
} else {
- element.find('.entypo.check').removeClass('selected');
+ element.find(".entypo-check").removeClass("selected");
}
});
},
diff --git a/app/assets/javascripts/app/views/bookmarklet_view.js b/app/assets/javascripts/app/views/bookmarklet_view.js
index c8e982fc3..c85ffdf7c 100644
--- a/app/assets/javascripts/app/views/bookmarklet_view.js
+++ b/app/assets/javascripts/app/views/bookmarklet_view.js
@@ -1,15 +1,15 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.Bookmarklet = Backbone.View.extend({
- separator: ' - ',
+ separator: "\n\n",
initialize: function(opts) {
// init a standalone publisher
app.publisher = new app.views.Publisher({standalone: true});
- app.publisher.on('publisher:add', this._postSubmit, this);
- app.publisher.on('publisher:sync', this._postSuccess, this);
- app.publisher.on('publisher:error', this._postError, this);
+ app.publisher.on("publisher:add", this._postSubmit, this);
+ app.publisher.on("publisher:sync", this._postSuccess, this);
+ app.publisher.on("publisher:error", this._postError, this);
this.param_contents = opts;
},
@@ -25,24 +25,28 @@ app.views.Bookmarklet = Backbone.View.extend({
var p = this.param_contents;
if( p.content ) return p.content;
- var contents = p.title + this.separator + p.url;
- if( p.notes ) contents += this.separator + p.notes;
+ var contents = "### " + p.title + this.separator;
+ if( p.notes ) {
+ var notes = p.notes.toString().replace(/(?:\r\n|\r|\n)/g, "\n> ");
+ contents += "> " + notes + this.separator;
+ }
+ contents += p.url;
return contents;
},
_postSubmit: function() {
- this.$('h4').text(Diaspora.I18n.t('bookmarklet.post_submit'));
+ this.$("h4").text(Diaspora.I18n.t("bookmarklet.post_submit"));
},
_postSuccess: function() {
- this.$('h4').text(Diaspora.I18n.t('bookmarklet.post_success'));
+ this.$("h4").text(Diaspora.I18n.t("bookmarklet.post_success"));
app.publisher.close();
this.$("#publisher").addClass("hidden");
_.delay(window.close, 2000);
},
_postError: function() {
- this.$('h4').text(Diaspora.I18n.t('bookmarklet.post_something'));
+ this.$("h4").text(Diaspora.I18n.t("bookmarklet.post_something"));
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/comment_stream_view.js b/app/assets/javascripts/app/views/comment_stream_view.js
index 5810c07cd..6878eec1a 100644
--- a/app/assets/javascripts/app/views/comment_stream_view.js
+++ b/app/assets/javascripts/app/views/comment_stream_view.js
@@ -21,16 +21,10 @@ app.views.CommentStream = app.views.Base.extend({
setupBindings: function() {
this.model.comments.bind('add', this.appendComment, this);
- this.model.bind("commentsExpanded", this.storeTextareaValue, this);
- this.model.bind("commentsExpanded", this.render, this);
},
postRenderTemplate : function() {
this.model.comments.each(this.appendComment, this);
-
- // add autoexpanders to new comment textarea
- this.$("textarea").autoResize({'extraSpace' : 10});
- this.$('textarea').val(this.textareaValue);
},
presenter: function(){
@@ -43,7 +37,7 @@ app.views.CommentStream = app.views.Base.extend({
createComment: function(evt) {
if(evt){ evt.preventDefault(); }
-
+
var commentText = $.trim(this.$('.comment_box').val());
this.$(".comment_box").val("");
this.$(".comment_box").css("height", "");
@@ -56,40 +50,61 @@ app.views.CommentStream = app.views.Base.extend({
},
keyDownOnCommentBox: function(evt) {
- if(evt.keyCode === 13 && evt.ctrlKey) {
+ if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
this.$("form").submit();
return false;
}
},
-
+
+ _insertPoint: 0, // An index of the comment added in the last call of this.appendComment
+
+ // This adjusts this._insertPoint according to timestamp value
+ _moveInsertPoint: function(timestamp, commentBlocks) {
+ if (commentBlocks.length === 0) {
+ this._insertPoint = 0;
+ return;
+ }
+
+ if (this._insertPoint > commentBlocks.length) {
+ this._insertPoint = commentBlocks.length;
+ }
+
+ while (this._insertPoint > 0 && timestamp < commentBlocks.eq(this._insertPoint - 1).find("time").attr("datetime")) {
+ this._insertPoint--;
+ }
+ while (this._insertPoint < commentBlocks.length &&
+ timestamp > commentBlocks.eq(this._insertPoint).find("time").attr("datetime")) {
+ this._insertPoint++;
+ }
+ },
+
appendComment: function(comment) {
// Set the post as the comment's parent, so we can check
// on post ownership in the Comment view.
comment.set({parent : this.model.toJSON()});
- this.$(".comments").append(new app.views.Comment({
- model: comment
- }).render().el);
+ var commentHtml = new app.views.Comment({model: comment}).render().el;
+ var commentBlocks = this.$(".comments div.comment.media");
+ this._moveInsertPoint(comment.get("created_at"), commentBlocks);
+ if (this._insertPoint === commentBlocks.length) {
+ this.$(".comments").append(commentHtml);
+ } else {
+ commentBlocks.eq(this._insertPoint).before(commentHtml);
+ }
+ this._insertPoint++;
},
commentTextareaFocused: function(){
this.$("form").removeClass('hidden').addClass("open");
},
- storeTextareaValue: function(){
- this.textareaValue = this.$('textarea').val();
- },
-
expandComments: function(evt){
if(evt){ evt.preventDefault(); }
var self = this;
this.model.comments.fetch({
success : function(resp){
- self.model.set({
- comments : resp.models,
- all_comments_loaded : true
- });
+ self.$("div.comment.show_comments").addClass("hidden");
self.model.trigger("commentsExpanded", self);
}
diff --git a/app/assets/javascripts/app/views/contact_stream_view.js b/app/assets/javascripts/app/views/contact_stream_view.js
index ad93301bd..cbc254c37 100644
--- a/app/assets/javascripts/app/views/contact_stream_view.js
+++ b/app/assets/javascripts/app/views/contact_stream_view.js
@@ -1,77 +1,79 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.ContactStream = Backbone.View.extend({
- initialize: function() {
- this.itemCount = 0;
- this.perPage = 25;
- this.query = '';
- this.resultList = this.collection.toArray();
+ initialize: function(opts) {
+ this.page = 1;
var throttledScroll = _.throttle(_.bind(this.infScroll, this), 200);
$(window).scroll(throttledScroll);
- this.on('renderContacts', this.renderContacts, this);
+ this.on("fetchContacts", this.fetchContacts, this);
+ this.urlParams = opts.urlParams;
},
render: function() {
- if( _.isEmpty(this.resultList) ) {
- var content = document.createDocumentFragment();
- content = '+')
');
- },
-
- getLocation: function(){
- var element = this.el;
-
- var locator = new OSM.Locator();
- locator.getAddress(function(address, latlng){
- $(element).html('');
- $('#location_coords').val(latlng.latitude + "," + latlng.longitude);
- });
- },
-});
-// @license-end
-
diff --git a/app/assets/javascripts/app/views/locator.js b/app/assets/javascripts/app/views/locator.js
new file mode 100644
index 000000000..364f3fa39
--- /dev/null
+++ b/app/assets/javascripts/app/views/locator.js
@@ -0,0 +1,33 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.views.Location = Backbone.View.extend({
+
+ el: "#location",
+
+ initialize: function(){
+ this.render();
+ this.getLocation();
+ },
+
+ render: function() {
+ $(", name: , ... }
+ */
+ prefillMention: function(persons) {
+ persons.forEach(function(person) {
+ this.addPersonToMentions(person);
+ var text = this.invisibleChar + person.name;
+ if(this.inputBox.val().length !== 0) {
+ text = this.inputBox.val() + " " + text;
+ }
+ this.inputBox.val(text);
+ this.updateMessageTexts();
+ }, this);
+ },
+
+ /**
+ * Selects next or previous result when result dropdown is open and
+ * user press up and down arrows.
+ */
+ onArrowKeyDown: function(e) {
+ if(!this.isVisible() || (e.which !== Keycodes.UP && e.which !== Keycodes.DOWN)) {
+ return;
+ }
+
+ e.preventDefault();
+ e.stopPropagation();
+
+ this.typeaheadInput.typeahead("activate");
+ this.typeaheadInput.typeahead("open");
+ this.typeaheadInput.trigger($.Event("keydown", {keyCode: e.keyCode, which: e.which}));
+ },
+
+ /**
+ * Listens for user input and opens results dropdown when input contains the trigger char
+ */
+ onInputBoxInput: function() {
+ this.cleanMentionedPeople();
+ this.updateMessageTexts();
+ this.updateTypeaheadInput();
+ },
+
+ onInputBoxKeyDown: function(e) {
+ // This also matches HOME/END on OSX which is CMD+LEFT, CMD+RIGHT
+ if(e.which === Keycodes.LEFT || e.which === Keycodes.RIGHT ||
+ e.which === Keycodes.HOME || e.which === Keycodes.END) {
+ _.defer(_.bind(this.updateTypeaheadInput, this));
+ return;
+ }
+
+ if(!this.isVisible) {
+ return true;
+ }
+
+ switch(e.which) {
+ case Keycodes.ESC:
+ case Keycodes.SPACE:
+ this.closeSuggestions();
+ break;
+ case Keycodes.UP:
+ case Keycodes.DOWN:
+ this.onArrowKeyDown(e);
+ break;
+ case Keycodes.RETURN:
+ case Keycodes.TAB:
+ if(this.$(".tt-cursor").length === 1) {
+ this.$(".tt-cursor").click();
+ return false;
+ }
+ break;
+ }
+ return true;
+ },
+
+ onInputBoxClick: function() {
+ this.updateTypeaheadInput();
+ },
+
+ onInputBoxBlur: function() {
+ this.closeSuggestions();
+ },
+
+ reset: function() {
+ this.inputBox.val("");
+ this.onInputBoxInput();
+ },
+
+ closeSuggestions: function() {
+ this.typeaheadInput.typeahead("val", "");
+ this.typeaheadInput.typeahead("close");
+ },
+
+ isVisible: function() {
+ return this.$(".tt-menu").is(":visible");
+ },
+
+ getTextForSubmit: function() {
+ return this.mentionedPeople.length ? this.inputBox.data("messageText") : this.inputBox.val();
+ }
+});
diff --git a/app/assets/javascripts/app/views/publisher/services_view.js b/app/assets/javascripts/app/views/publisher/services_view.js
index 1ed4c988b..8fd17a9e8 100644
--- a/app/assets/javascripts/app/views/publisher/services_view.js
+++ b/app/assets/javascripts/app/views/publisher/services_view.js
@@ -37,7 +37,7 @@ app.views.PublisherServices = Backbone.View.extend({
// keep track of character count
_createCounter: function() {
// remove any obsolete counters
- this.input.siblings('.counter').remove();
+ $("#publisher .counter").remove();
// create new counter
var min = 40000;
@@ -47,7 +47,13 @@ app.views.PublisherServices = Backbone.View.extend({
var num = parseInt($(value).attr('maxchar'));
if (min > num) { min = num; }
});
- this.input.charCount({allowed: min, warning: min/10 });
+ var counter = $("");
+ $("#publisher-images").after(counter);
+ this.input.charCount({
+ allowed: min,
+ warning: min / 10,
+ counter: counter
+ });
}
},
diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js
index 00580f57a..5f1fedc0c 100644
--- a/app/assets/javascripts/app/views/publisher/uploader_view.js
+++ b/app/assets/javascripts/app/views/publisher/uploader_view.js
@@ -6,7 +6,7 @@
app.views.PublisherUploader = Backbone.View.extend({
- allowedExtensions: ['jpg', 'jpeg', 'png', 'gif', 'tif', 'tiff'],
+ allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"],
sizeLimit: 4194304, // bytes
initialize: function(opts) {
@@ -18,14 +18,14 @@ app.views.PublisherUploader = Backbone.View.extend({
//debug: true,
- action: '/photos',
+ action: "/photos",
params: { photo: { pending: true }},
allowedExtensions: this.allowedExtensions,
sizeLimit: this.sizeLimit,
messages: {
- typeError: Diaspora.I18n.t('photo_uploader.invalid_ext'),
- sizeError: Diaspora.I18n.t('photo_uploader.size_error'),
- emptyError: Diaspora.I18n.t('photo_uploader.empty')
+ typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"),
+ sizeError: Diaspora.I18n.t("photo_uploader.size_error"),
+ emptyError: Diaspora.I18n.t("photo_uploader.empty")
},
onProgress: _.bind(this.progressHandler, this),
onSubmit: _.bind(this.submitHandler, this),
@@ -33,22 +33,22 @@ app.views.PublisherUploader = Backbone.View.extend({
});
- this.el_info = $('');
- this.publisher.el_wrapper.before(this.el_info);
+ this.info = $("");
+ this.publisher.wrapperEl.before(this.info);
- this.publisher.el_photozone.on('click', '.x', _.bind(this._removePhoto, this));
+ this.publisher.photozoneEl.on("click", ".x", _.bind(this._removePhoto, this));
},
progressHandler: function(id, fileName, loaded, total) {
var progress = Math.round(loaded / total * 100);
- this.el_info.text(fileName + ' ' + progress + '%').fadeTo(200, 1);
- this.publisher.el_photozone
- .find('li.loading').first().find('.bar')
- .width(progress + '%');
+ this.info.text(fileName + " " + progress + "%").fadeTo(200, 1);
+ this.publisher.photozoneEl
+ .find("li.loading").first().find(".progress-bar")
+ .width(progress + "%");
},
submitHandler: function() {
- this.$el.addClass('loading');
+ this.$el.addClass("loading");
this._addPhotoPlaceholder();
},
@@ -57,32 +57,34 @@ app.views.PublisherUploader = Backbone.View.extend({
var publisher = this.publisher;
publisher.setButtonsEnabled(false);
- publisher.el_wrapper.addClass('with_attachments');
- publisher.el_photozone.append(
- '' +
- ' +')
'+
- ' '
+ publisher.wrapperEl.addClass("with_attachments");
+ publisher.photozoneEl.append(
+ "" +
+ " ![\"\"](\"\"+Handlebars.helpers.imageUrl(\"ajax-loader2.gif\")+\"\")
"+
+ " "
);
},
uploadCompleteHandler: function(_id, fileName, response) {
if (response.success){
- this.el_info.text(Diaspora.I18n.t('photo_uploader.completed', {file: fileName})).fadeTo(2000, 0);
+ this.info.text(Diaspora.I18n.t("photo_uploader.completed", {file: fileName})).fadeTo(2000, 0);
var id = response.data.photo.id,
url = response.data.photo.unprocessed_image.url;
this._addFinishedPhoto(id, url);
- this.trigger('change');
+ this.trigger("change");
} else {
this._cancelPhotoUpload();
- this.trigger('change');
- this.el_info.text(Diaspora.I18n.t('photo_uploader.error', {file: fileName}));
- this.publisher.el_wrapper.find('#photodropzone_container').first().after(
- '
'; }
- item += row.name;
- if (row.handle) { item += '= 0; i--) {
+ if (Math.round($(streamElements[i]).offset().top) < posUser + this._headerSize) {
+ this.selectPost(streamElements[i]);
return;
}
}
// standard: first post
- if(stream_elements[0]){
- this.selectPost(stream_elements[0]);
+ if (streamElements[0]) {
+ this.selectPost(streamElements[0]);
}
},
@@ -118,7 +118,7 @@ app.views.StreamShortcuts = Backbone.View.extend({
var selected=this.$('div.stream_element.loaded.shortcut_selected');
selected.removeClass('shortcut_selected').removeClass('highlighted');
//move to new post
- window.scrollTo(window.pageXOffset, element.offsetTop-this._headerSize);
+ window.scrollTo(window.pageXOffset, Math.round($(element).offset().top - this._headerSize));
//add the selection and selected-class to new post
element.className+=" shortcut_selected highlighted";
},
diff --git a/app/assets/javascripts/app/views/stream_faces_view.js b/app/assets/javascripts/app/views/stream_faces_view.js
deleted file mode 100644
index 6ad00d057..000000000
--- a/app/assets/javascripts/app/views/stream_faces_view.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-app.views.StreamFaces = app.views.Base.extend({
-
- templateName : "stream-faces",
-
- className : "stream-faces",
-
- tooltipSelector : ".avatar",
-
- initialize : function(){
- this.updatePeople();
- app.stream.items.bind("add", this.updatePeople, this);
- app.stream.items.bind("remove", this.updatePeople, this);
- },
-
- presenter : function() {
- return {people : this.people};
- },
-
- updatePeople : function(){
- if(this.people && this.people.length >= 15) { return }
- this.people = _(this.collection.models).chain()
- .map(function(post){ return post.get("author") })
- .compact()
- .uniq(false, function(person){ return person.id })
- .value()
- .slice(0,15);
-
- this.render();
- }
-});
-// @license-end
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index 4fe9bdb82..b298cd0ad 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -7,6 +7,7 @@ app.views.StreamPost = app.views.Post.extend({
subviews : {
".feedback" : "feedbackView",
".likes" : "likesInfoView",
+ ".reshares" : "resharesInfoView",
".comments" : "commentStreamView",
".post-content" : "postContentView",
".oembed" : "oEmbedView",
@@ -29,13 +30,20 @@ app.views.StreamPost = app.views.Post.extend({
"click .destroy_participation": "destroyParticipation"
},
- tooltipSelector : ".timeago, .post_scope, .post_report, .block_user, .delete, .create_participation, .destroy_participation",
+ tooltipSelector : [".timeago",
+ ".post_scope",
+ ".post_report",
+ ".block_user",
+ ".delete",
+ ".create_participation",
+ ".destroy_participation",
+ ".permalink"].join(", "),
initialize : function(){
- var personId = this.model.get('author').id;
- app.events.on('person:block:'+personId, this.remove, this);
+ var personId = this.model.get("author").id;
+ app.events.on("person:block:"+personId, this.remove, this);
- this.model.on('remove', this.remove, this);
+ this.model.on("remove", this.remove, this);
//subviews
this.commentStreamView = new app.views.CommentStream({model : this.model});
this.oEmbedView = new app.views.OEmbed({model : this.model});
@@ -48,6 +56,10 @@ app.views.StreamPost = app.views.Post.extend({
return new app.views.LikesInfo({model : this.model});
},
+ resharesInfoView : function(){
+ return new app.views.ResharesInfo({model : this.model});
+ },
+
feedbackView : function(){
if(!app.currentUser.authenticated()) { return null }
return new app.views.Feedback({model : this.model});
@@ -78,14 +90,11 @@ app.views.StreamPost = app.views.Post.extend({
blockUser: function(evt){
if(evt) { evt.preventDefault(); }
- if(!confirm(Diaspora.I18n.t('ignore_user'))) { return }
+ if(!confirm(Diaspora.I18n.t("ignore_user"))) { return }
this.model.blockAuthor()
.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('ignore_failed')
- });
+ app.flashMessages.error(Diaspora.I18n.t("ignore_failed"));
});
},
@@ -97,7 +106,7 @@ app.views.StreamPost = app.views.Post.extend({
hidePost : function(evt) {
if(evt) { evt.preventDefault(); }
- if(!confirm(Diaspora.I18n.t('confirm_dialog'))) { return }
+ if(!confirm(Diaspora.I18n.t("confirm_dialog"))) { return }
var self = this;
$.ajax({
@@ -110,10 +119,7 @@ app.views.StreamPost = app.views.Post.extend({
self.remove();
})
.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('hide_post_failed')
- });
+ app.flashMessages.error(Diaspora.I18n.t("hide_post_failed"));
});
},
@@ -137,7 +143,7 @@ app.views.StreamPost = app.views.Post.extend({
focusCommentTextarea: function(evt){
evt.preventDefault();
- this.$(".new_comment_form_wrapper").removeClass("hidden");
+ this.$(".new-comment-form-wrapper").removeClass("hidden");
this.$(".comment_box").focus();
return this;
diff --git a/app/assets/javascripts/app/views/stream_view.js b/app/assets/javascripts/app/views/stream_view.js
index d9ed05306..45e2091ff 100644
--- a/app/assets/javascripts/app/views/stream_view.js
+++ b/app/assets/javascripts/app/views/stream_view.js
@@ -9,18 +9,13 @@ app.views.Stream = app.views.InfScroll.extend({
this.postViews = [];
this.setupNSFW();
- this.setupLightbox();
this.setupInfiniteScroll();
this.markNavSelected();
+ this.initInvitationModal();
},
postClass : app.views.StreamPost,
- setupLightbox : function(){
- this.lightbox = Diaspora.BaseWidget.instantiate("Lightbox");
- this.$el.delegate("a.stream-photo-link", "click", this.lightbox.lightboxImageClicked);
- },
-
setupNSFW : function(){
function reRenderPostViews() {
_.map(this.postViews, function(view){ view.render() });
@@ -33,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({
var streamSelection = $("#stream_selection");
streamSelection.find("[data-stream]").removeClass("selected");
streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");
+ },
+
+ initInvitationModal : function() {
+ $(".invitations-link").click(function() {
+ app.helpers.showModal("#invitationsModal");
+ });
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/tag_following_action_view.js b/app/assets/javascripts/app/views/tag_following_action_view.js
index 37d95ff2a..e62754c0c 100644
--- a/app/assets/javascripts/app/views/tag_following_action_view.js
+++ b/app/assets/javascripts/app/views/tag_following_action_view.js
@@ -43,12 +43,12 @@ app.views.TagFollowingAction = app.views.Base.extend({
},
mouseIn : function(){
- this.$("input").removeClass("green").addClass("btn-danger");
+ this.$("input").removeClass("btn-success").addClass("btn-danger");
this.$("input").val( Diaspora.I18n.t('stream.tags.stop_following', {tag: this.model.attributes.name} ) );
},
mouseOut : function() {
- this.$("input").removeClass("btn-danger").addClass("green");
+ this.$("input").removeClass("btn-danger").addClass("btn-success");
this.$("input").val( Diaspora.I18n.t('stream.tags.following', {"tag" : this.model.attributes.name} ) );
},
diff --git a/app/assets/javascripts/app/views/tag_following_list_view.js b/app/assets/javascripts/app/views/tag_following_list_view.js
index 3ccdf3a6e..0504ab270 100644
--- a/app/assets/javascripts/app/views/tag_following_list_view.js
+++ b/app/assets/javascripts/app/views/tag_following_list_view.js
@@ -46,7 +46,7 @@ app.views.TagFollowingList = app.views.Base.extend({
});
this.$("input").bind('keydown', function(evt){
- if(evt.keyCode === 13 || evt.keyCode === 9 || evt.keyCode === 32){
+ if(evt.which === Keycodes.ENTER || evt.which === Keycodes.TAB || evt.which === Keycodes.SPACE) {
evt.preventDefault();
if( $('li.as-result-item.active').length === 0 ){
$('li.as-result-item').first().click();
diff --git a/app/assets/javascripts/app/views/tag_following_view.js b/app/assets/javascripts/app/views/tag_following_view.js
index 838fd896d..ef6d08e5d 100644
--- a/app/assets/javascripts/app/views/tag_following_view.js
+++ b/app/assets/javascripts/app/views/tag_following_view.js
@@ -9,7 +9,7 @@ app.views.TagFollowing = app.views.Base.extend({
tagName: "li",
events : {
- "click .delete_tag_following": "destroyModel"
+ "click .delete-tag-following": "destroyModel"
},
initialize : function(){
@@ -31,6 +31,6 @@ app.views.TagFollowing = app.views.Base.extend({
tag : this.model
});
}
-
+
});
// @license-end
diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js
index e420281fb..3913f8798 100644
--- a/app/assets/javascripts/app/views/tags_view.js
+++ b/app/assets/javascripts/app/views/tags_view.js
@@ -2,7 +2,9 @@
app.views.Tags = Backbone.View.extend({
initialize: function(opts) {
- app.publisher.setText("#"+ opts.hashtagName + " ");
+ if(app.publisher) {
+ app.publisher.setText("#"+ opts.hashtagName + " ");
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/aspects-dropdown.js b/app/assets/javascripts/aspects-dropdown.js
deleted file mode 100644
index 6c1ea03bc..000000000
--- a/app/assets/javascripts/aspects-dropdown.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-// Copyright (c) 2010-2012, Diaspora Inc. This file is
-// licensed under the Affero General Public License version 3 or later. See
-// the COPYRIGHT file.
-
-var AspectsDropdown = {
- updateNumber: function(dropdown, personId, number, inAspectClass){
- var button = dropdown.parents(".dropdown").children('.button.toggle'),
- selectedAspects = dropdown.children(".selected").length,
- allAspects = dropdown.children().length,
- replacement,
- message,
- isInPublisher = dropdown.closest('#publisher').length;
-
- if (number === 0) {
- button.removeClass(inAspectClass);
- if (isInPublisher) {
- replacement = Diaspora.I18n.t("aspect_dropdown.select_aspects");
- } else {
- replacement = Diaspora.I18n.t("aspect_dropdown.add_to_aspect");
- /* flash message prompt */
- message = Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", {name: dropdown.data('person-short-name')});
- Diaspora.page.flashMessages.render({success: true, notice: message});
- }
- } else if (selectedAspects === allAspects) {
- replacement = Diaspora.I18n.t('aspect_dropdown.all_aspects');
- } else if (number === 1) {
- button.addClass(inAspectClass);
- replacement = dropdown.find(".selected").first().text();
- /* flash message prompt */
- if (!isInPublisher) {
- message = Diaspora.I18n.t("aspect_dropdown.started_sharing_with", {name: dropdown.data('person-short-name')});
- Diaspora.page.flashMessages.render({success: true, notice: message});
- }
- } else {
- replacement = Diaspora.I18n.t('aspect_dropdown.toggle', { count: number.toString()});
- }
-
- // if we are in the publisher, we add the visibility icon
- if (isInPublisher) {
- var icon = $('#visibility-icon');
- if (replacement.trim() === Diaspora.I18n.t('stream.public')) {
- icon.removeClass('lock');
- icon.addClass('globe');
- } else {
- icon.removeClass('globe');
- icon.addClass('lock');
- }
- button.find('.text').text(replacement);
- } else {
- button.text(replacement + ' ▼');
- }
- },
-
- toggleCheckbox: function(check) {
- if(!check.hasClass('radio')){
- var selectedAspects = check.closest(".dropdown").find("li.radio");
- AspectsDropdown.uncheckGroup(selectedAspects);
- }
-
- check.toggleClass('selected');
- },
-
- toggleRadio: function(check) {
- var selectedAspects = check.closest(".dropdown").find("li");
-
- AspectsDropdown.uncheckGroup(selectedAspects);
- AspectsDropdown.toggleCheckbox(check);
- },
-
- uncheckGroup: function(elements){
- $.each(elements, function(index, value) {
- $(value).removeClass('selected');
- });
- }
-};
-// @license-end
diff --git a/app/assets/javascripts/bookmarklet.js b/app/assets/javascripts/bookmarklet.js
new file mode 100644
index 000000000..4755490e4
--- /dev/null
+++ b/app/assets/javascripts/bookmarklet.js
@@ -0,0 +1,56 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+var bookmarklet = function(url, width, height, opts) {
+ var maxLen = 1900; // max GET request length, see #3076
+ var maxTitleLen = 128; // cut title after this length, if too long
+
+ // calculate popup dimensions & placement
+ var dim = function() {
+ var w = window,
+ winTop = (w.screenTop ? w.screenTop : w.screenY),
+ winLeft = (w.screenLeft ? w.screenLeft : w.screenX),
+ top = (winTop + (w.innerHeight / 2) - (height / 2)),
+ left = (winLeft + (w.innerWidth / 2) - (width / 2));
+ return "width=" + width + ",height=" + height + ",top=" + top + ",left=" + left;
+ };
+
+ // prepare url parameters
+ var params = function() {
+ var w = window,
+ d = document,
+ href = w.location.href,
+ title = d.title,
+ sel = w.getSelection ? w.getSelection() :
+ d.getSelection ? d.getSelection() :
+ d.selection.createRange().text,
+ notes = sel.toString(),
+ len = maxLen - href.length;
+
+ if( (title+notes).length > len ) {
+ // shorten the text to fit in a GET request
+ if( title.length > maxTitleLen ) title = title.substr(0, maxTitleLen) + " ...";
+ if( notes.length > (len-maxTitleLen) ) notes = notes.substr(0, len-maxTitleLen) + " ...";
+ }
+
+ return "url=" + encodeURIComponent(href) +
+ "&title=" + encodeURIComponent(title) +
+ "¬es=" + encodeURIComponent(notes);
+ };
+
+ // popup (or redirect) action
+ var act = function() {
+ var popupOpts = (opts || "location=yes,links=no,scrollbars=yes,toolbar=no"),
+ jumpUrl = url + "?jump=yes";
+
+ (window.open(url + "?" + params(), "diaspora_bookmarklet", popupOpts + "," + dim()) ||
+ (window.location.href = jumpUrl + "&" + params()));
+ };
+
+ if( /Firefox/.test(navigator.userAgent) ) {
+ setTimeout(act, 0);
+ } else {
+ act();
+ }
+};
+
+// @license-end
diff --git a/app/assets/javascripts/browser_detection.js b/app/assets/javascripts/browser_detection.js
deleted file mode 100644
index 6a8e5adab..000000000
--- a/app/assets/javascripts/browser_detection.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-jQuery.browser = {};
-jQuery.browser.mozilla = /mozilla/.test(navigator.userAgent.toLowerCase()) && !/webkit/.test(navigator.userAgent.toLowerCase());
-jQuery.browser.webkit = /webkit/.test(navigator.userAgent.toLowerCase());
-jQuery.browser.opera = /opera/.test(navigator.userAgent.toLowerCase());
-jQuery.browser.msie = /msie/.test(navigator.userAgent.toLowerCase());
-// @license-end
-
diff --git a/app/assets/javascripts/contact-list.js b/app/assets/javascripts/contact-list.js
index 0e8bda50e..3dfa85dc5 100644
--- a/app/assets/javascripts/contact-list.js
+++ b/app/assets/javascripts/contact-list.js
@@ -15,9 +15,15 @@ var List = {
});
streamEl.html(string);
- $('.aspect_membership_dropdown').each(function(){
- new app.views.AspectMembership({el: this});
- });
+
+ if (data.contacts) {
+ var contacts = new app.collections.Contacts(data.contacts);
+ $(".aspect_membership_dropdown.placeholder").each(function() {
+ var personId = $(this).data("personId");
+ var view = new app.views.AspectMembership({person: contacts.findWhere({"person_id": personId}).person});
+ $(this).html(view.render().$el);
+ });
+ }
},
startSearchDelay: function (theSearch) {
@@ -25,4 +31,3 @@ var List = {
}
};
// @license-end
-
diff --git a/app/assets/javascripts/diaspora.js b/app/assets/javascripts/diaspora.js
index 157a6ab5e..b05b28601 100644
--- a/app/assets/javascripts/diaspora.js
+++ b/app/assets/javascripts/diaspora.js
@@ -49,7 +49,7 @@
$.extend(Diaspora.Widgets[Widget].prototype, Diaspora.EventBroker.extend(Diaspora.BaseWidget));
var widget = new Diaspora.Widgets[Widget](),
- args = Array.prototype.slice.call(arguments, 1);
+ args = Array.prototype.slice.call(arguments, 1);
widget.publish("widget/ready", args);
@@ -70,7 +70,6 @@
$.extend(this, {
directionDetector: this.instantiate("DirectionDetector"),
events: function() { return Diaspora.page.eventsContainer.data("events"); },
- flashMessages: this.instantiate("FlashMessages"),
header: this.instantiate("Header", body.find("header")),
timeAgo: this.instantiate("TimeAgo")
});
@@ -86,7 +85,7 @@
Diaspora.page = new Page();
}
- if(!$.mobile)//why does this need this?
+ if(!$.mobile) // why does this need this?
$.extend(Diaspora.page, new Diaspora.BasePage($(document.body)));
Diaspora.page.publish("page/ready", [$(document.body)]);
};
diff --git a/app/assets/javascripts/helpers/i18n.js b/app/assets/javascripts/helpers/i18n.js
index 9be574c45..42bd7a886 100644
--- a/app/assets/javascripts/helpers/i18n.js
+++ b/app/assets/javascripts/helpers/i18n.js
@@ -20,12 +20,11 @@ Diaspora.I18n = {
updateLocale: function(locale, data) {
locale.data = $.extend(locale.data, data);
- var rule = this._resolve(locale, ['pluralization_rule']);
- if (rule !== "") {
- /* jshint evil:true */
- // TODO change this to `locale.pluralizationKey = rule`?
+ var rule = locale.data.pluralization_rule;
+ if (typeof rule !== "undefined") {
+ /* eslint-disable no-eval */
eval("locale.pluralizationKey = "+rule);
- /* jshint evil:false */
+ /* eslint-enable no-eval */
}
},
@@ -46,14 +45,9 @@ Diaspora.I18n = {
: locale.data[nextNamespace];
if(typeof translatedMessage === "undefined") {
- if (typeof locale.fallback === "undefined") {
- return "";
- } else {
- return this._resolve(locale.fallback, originalItems);
- }
+ throw new Error("Missing translation: " + originalItems.join("."));
}
}
-
return translatedMessage;
},
@@ -68,7 +62,7 @@ Diaspora.I18n = {
return _.template(this._resolve(locale, items))(views || {});
} catch (e) {
if (typeof locale.fallback === "undefined") {
- return "";
+ throw e;
} else {
return this._render(locale.fallback, originalItems, views);
}
@@ -77,10 +71,12 @@ Diaspora.I18n = {
reset: function() {
this.locale.data = {};
+ this.locale.fallback.data = {};
- if( arguments.length > 0 && !(_.isEmpty(arguments[0])) )
+ if(arguments.length > 0 && !(_.isEmpty(arguments[0]))) {
this.locale.data = arguments[0];
+ this.locale.fallback.data = arguments[0];
+ }
}
};
// @license-end
-
diff --git a/app/assets/javascripts/helpers/markdown_editor.js b/app/assets/javascripts/helpers/markdown_editor.js
new file mode 100644
index 000000000..55df13480
--- /dev/null
+++ b/app/assets/javascripts/helpers/markdown_editor.js
@@ -0,0 +1,162 @@
+Diaspora.MarkdownEditor = function(element, opts) {
+ this.initialize(element, opts);
+};
+
+Diaspora.MarkdownEditor.prototype = {
+ constructor: Diaspora.MarkdownEditor,
+
+ initialize: function(element, opts) {
+ this.options = {
+ resize: "none",
+ onHidePreview: $.noop,
+ onPostPreview: $.noop
+ };
+
+ $.extend(this.options, opts);
+
+ this.options.fullscreen = {enable: false, icons: {}};
+ this.options.language = this.localize();
+ this.options.hiddenButtons = ["cmdPreview"];
+ this.options.onShow = this.onShow.bind(this);
+
+ $(element).markdown(this.options);
+ },
+
+ /**
+ * Attach the $.fn.markdown instance to the current MarkdownEditor instance
+ * and initializes the preview and edit tabs after the editor is shown.
+ * @param instance
+ */
+ onShow: function(instance) {
+ this.instance = instance;
+
+ if (_.isFunction(this.options.onPreview)) {
+ instance.$editor.find(".md-header").remove(".write-preview-tabs").prepend(this.createTabsElement());
+ }
+
+ if (_.isFunction(this.options.onClose)) {
+ instance.$editor.find(".md-header").remove(".md-cancel").append(this.createCloseElement());
+ }
+
+ // Monkey patch to change icons. Will have to PR upstream
+ var icons = {
+ cmdUrl: ["glyphicon-link", "entypo-link"],
+ cmdImage: ["glyphicon-picture", "entypo-picture"],
+ cmdList: ["glyphicon-list", "entypo-list"],
+ cmdListO: ["glyphicon-th-list", "entypo-numbered-list"],
+ cmdCode: ["glyphicon-asterisk", "entypo-code"],
+ cmdQuote: ["glyphicon-comment", "entypo-comment"]
+ };
+
+ Object.keys(icons).forEach(function(key) {
+ instance.$editor.find("[data-handler='bootstrap-markdown-" + key + "']").find(".glyphicon")
+ .removeClass("glyphicon").removeClass(icons[key][0])
+ .addClass(icons[key][1]);
+ });
+ },
+
+ /**
+ * Creates write and preview tabs inside the markdown editor header.
+ * @returns {jQuery} The created tabs
+ */
+ createTabsElement: function() {
+ var self = this;
+
+ var tabElement = $("");
+
+ var writeTab = $("");
+ this.writeLink = $("")
+ .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.write"));
+
+ this.writeLink.append($(""));
+ this.writeLink.append($("")
+ .text(Diaspora.I18n.t("publisher.markdown_editor.write")));
+
+ this.writeLink.click(function(evt) {
+ evt.preventDefault();
+ self.hidePreview();
+ });
+
+ writeTab.append(this.writeLink);
+
+ var previewTab = $("");
+ this.previewLink = $("")
+ .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview"));
+
+ this.previewLink.append($(""));
+ this.previewLink.append($("")
+ .text(Diaspora.I18n.t("publisher.markdown_editor.preview")));
+
+ this.previewLink.click(function(evt) {
+ evt.preventDefault();
+ self.showPreview();
+ });
+
+ previewTab.append(this.previewLink);
+
+ return tabElement.append(writeTab).append(previewTab);
+ },
+
+ /**
+ * Creates a cancel button that executes {options#onClose} on click.
+ * @returns {jQuery} The created cancel button
+ */
+ createCloseElement: function() {
+ var self = this;
+ var button = $("")
+ .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.cancel"));
+
+ button.click(function() {
+ self.hidePreview();
+ self.options.onClose();
+ });
+
+ return button.append($(""));
+ },
+
+ hidePreview: function() {
+ if (this.writeLink) {
+ this.writeLink.tab("show");
+ this.instance.hidePreview();
+ this.options.onHidePreview();
+ }
+ },
+
+ showPreview: function() {
+ if (this.previewLink) {
+ this.previewLink.tab("show");
+ this.instance.showPreview();
+ this.options.onPostPreview();
+ }
+ },
+
+ localize: function() {
+ var locale = Diaspora.I18n.language;
+
+ $.fn.markdown.messages[locale] = {
+ "Bold": Diaspora.I18n.t("publisher.markdown_editor.tooltips.bold"),
+ "Italic": Diaspora.I18n.t("publisher.markdown_editor.tooltips.italic"),
+ "Heading": Diaspora.I18n.t("publisher.markdown_editor.tooltips.heading"),
+ "URL/Link": Diaspora.I18n.t("publisher.markdown_editor.tooltips.insert_link"),
+ "Image": Diaspora.I18n.t("publisher.markdown_editor.tooltips.insert_image"),
+ "Ordered List": Diaspora.I18n.t("publisher.markdown_editor.tooltips.insert_ordered_list"),
+ "Unordered List": Diaspora.I18n.t("publisher.markdown_editor.tooltips.insert_unordered_list"),
+ "Preview": Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview"),
+ "Quote": Diaspora.I18n.t("publisher.markdown_editor.tooltips.quote"),
+ "Code": Diaspora.I18n.t("publisher.markdown_editor.tooltips.code"),
+ "strong text": Diaspora.I18n.t("publisher.markdown_editor.texts.strong"),
+ "emphasized text": Diaspora.I18n.t("publisher.markdown_editor.texts.italic"),
+ "heading text": Diaspora.I18n.t("publisher.markdown_editor.texts.heading"),
+ "enter link description here": Diaspora.I18n.t("publisher.markdown_editor.texts.insert_link_description_text"),
+ "Insert Hyperlink": Diaspora.I18n.t("publisher.markdown_editor.texts.insert_link_help_text"),
+ "enter image description here": Diaspora.I18n.t("publisher.markdown_editor.texts.insert_image_description_text"),
+ "Insert Image Hyperlink": Diaspora.I18n.t("publisher.markdown_editor.texts.insert_image_help_text"),
+ "enter image title here": Diaspora.I18n.t("publisher.markdown_editor.texts.insert_image_title"),
+ "list text here": Diaspora.I18n.t("publisher.markdown_editor.texts.list"),
+ "quote here": Diaspora.I18n.t("publisher.markdown_editor.texts.quote"),
+ "code text here": Diaspora.I18n.t("publisher.markdown_editor.texts.code")
+ };
+
+ return locale;
+ }
+};
diff --git a/app/assets/javascripts/jasmine-load-all.js b/app/assets/javascripts/jasmine-load-all.js
index 793b86e0e..37920dc40 100644
--- a/app/assets/javascripts/jasmine-load-all.js
+++ b/app/assets/javascripts/jasmine-load-all.js
@@ -1,4 +1,4 @@
-//= require jquery
+//= require jquery2
//= require handlebars.runtime
//= require templates
//= require main
diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index cf75c913b..d2774dafb 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -12,7 +12,6 @@ $(document).ready(function() {
var jid = app.currentUser.get('diaspora_id');
jsxc.init({
root: '/assets/diaspora_jsxc',
- logoutElement: $('.user-menu-item [data-method=delete]'),
rosterAppend: 'body',
otr: {
debug: true,
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index beaf399ee..e5b5a8688 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -6,19 +6,13 @@
//= require js-routes
//= require underscore
//= require backbone
-//= require jquery.hotkeys
//= require jquery.remotipart
-//= require jquery.autoresize
-//= require jquery.charcount
+//= require autosize
+//= require charcount
//= require jquery-placeholder
//= require rails-timeago
-//= require jquery.facebox
-//= require browser_detection
//= require jquery.events.input
-//= require jakobmattsson-jquery-elastic
-//= require jquery.mentionsInput
//= require jquery.infinitescroll-custom
-//= require jquery.autocomplete-custom
//= require jquery-ui/core
//= require jquery-ui/widget
//= require jquery-ui/mouse
@@ -36,15 +30,18 @@
//= require markdown-it-sup
//= require highlightjs
//= require clear-form
+//= require typeahead.bundle.js
//= require app/app
//= require diaspora
//= require_tree ./helpers
//= require_tree ./pages
//= require_tree ./widgets
-//= require aspects-dropdown
-//= require mentions
-//= require bootstrap-tooltip
-//= require bootstrap-popover
-//= require bootstrap-dropdown
-//= require bootstrap-modal
+//= require bootstrap
//= require osmlocator
+//= require bootstrap-switch
+//= require blueimp-gallery
+//= require blueimp-gallery/blueimp-gallery-indicator
+//= require leaflet
+//= require api/authorization_page
+// = require bootstrap-markdown/bootstrap-markdown
+// = require helpers/markdown_editor
diff --git a/app/assets/javascripts/mentions.js b/app/assets/javascripts/mentions.js
deleted file mode 100644
index 33058ae67..000000000
--- a/app/assets/javascripts/mentions.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-var Mentions = {
- initialize: function(mentionsInput) {
- return mentionsInput.mentionsInput(Mentions.options);
- },
-
- // pre-fetch the list of contacts for the current user.
- // called by the initializer of the publisher, for faster ('offline')
- // execution of the filtering for mentions
- fetchContacts : function(){
- Mentions.contacts || $.getJSON("/contacts", function(data) {
- Mentions.contacts = Mentions.createList(data);
- });
- },
-
- // creates a list of mentions out of a list of contacts
- // @see _contactToMention
- createList: function(contacts) {
- return _.map(contacts, Mentions._contactToMention);
- },
-
- // takes a given contact object and modifies to fit the format
- // expected by the jQuery.mentionsInput plugin.
- // @see http://podio.github.com/jquery-mentions-input/
- _contactToMention: function(contact) {
- contact.value = contact.name;
- return contact;
- },
-
- // default options for jQuery.mentionsInput
- // @see http://podio.github.com/jquery-mentions-input/
- options: {
- elastic: false,
- minChars: 1,
-
- onDataRequest: function(mode, query, callback) {
- var filteredResults = _.filter(Mentions.contacts, function(item) { return item.name.toLowerCase().indexOf(query.toLowerCase()) > -1 });
-
- callback.call(this, filteredResults.slice(0,5));
- },
-
- templates: {
- mentionItemSyntax: _.template("@{<%= name %> ; <%= handle %>}")
- }
- }
-};
-// @license-end
-
diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js
index 5a97bd54f..fad57b3f0 100644
--- a/app/assets/javascripts/mobile/mobile.js
+++ b/app/assets/javascripts/mobile/mobile.js
@@ -4,302 +4,25 @@
* licensed under the Affero General Public License version 3 or later. See
* the COPYRIGHT file.
*/
-//= require jquery.charcount
+//= require jquery-textchange
+//= require charcount
//= require js-routes
-//= require mbp-helper
+//= require autosize
+//= require keycodes
//= require jquery.autoSuggest.custom
//= require fileuploader-custom
//= require rails-timeago
//= require underscore
+//= require bootstrap
//= require diaspora
//= require helpers/i18n
//= require widgets/timeago
+//= require mobile/mobile_application
//= require mobile/mobile_file_uploader
//= require mobile/profile_aspects
//= require mobile/tag_following
-
-$(document).ready(function(){
-
- $('.shield a').click(function(){
- $(this).parents('.shield_wrapper').remove();
- return false;
- });
- var showLoader = function(link){
- link.addClass('loading');
- };
-
- var removeLoader = function(link){
- link.removeClass('loading')
- .toggleClass('active')
- .toggleClass('inactive');
- };
-
- /* Drawer menu */
- $('#menu_badge').bind("tap click", function(evt){
- evt.preventDefault();
- $("#app").toggleClass('draw');
- });
-
- /* Show / hide aspects in the drawer */
- $('#all_aspects').bind("tap click", function(evt){
- evt.preventDefault();
- $("#all_aspects + li").toggleClass('hide');
- });
-
- /* Show / hide followed tags in the drawer */
- $('#followed_tags').bind("tap click", function(evt){
- evt.preventDefault();
- $("#followed_tags + li").toggleClass('hide');
- });
-
- /* Heart toggle */
- $(".like_action", ".stream").bind("tap click", function(evt){
- evt.preventDefault();
- var link = $(this),
- likeCounter = $(this).closest(".stream_element").find("like_count"),
- href = link.attr("href");
-
- if(!link.hasClass("loading")){
- if(link.hasClass('inactive')) {
- $.ajax({
- url: href,
- dataType: 'json',
- type: 'POST',
- beforeSend: showLoader(link),
- success: function(data){
- removeLoader(link);
- link.attr("href", href + "/" + data["id"]);
-
- if(likeCounter){
- likeCounter.text(parseInt(likeCounter.text) + 1);
- }
- }
- });
- }
- else if(link.hasClass("active")){
- $.ajax({
- url: link.attr("href"),
- dataType: 'json',
- type: 'DELETE',
- beforeSend: showLoader(link),
- complete: function(){
- removeLoader(link);
- link.attr("href", href.replace(/\/\d+$/, ''));
-
- if(likeCounter){
- likeCounter.text(parseInt(likeCounter.text) - 1);
- }
- }
- });
- }
- }
- });
-
- /* Reshare */
- $(".reshare_action", ".stream").bind("tap click", function(evt){
- evt.preventDefault();
-
- var link = $(this),
- href = link.attr("href"),
- confirmText = link.attr('title');
-
- if(!link.hasClass("loading")) {
- if(link.hasClass('inactive')) {
- if(confirm(confirmText)) {
- $.ajax({
- url: href + "&provider_display_name=mobile",
- dataType: 'json',
- type: 'POST',
- beforeSend: showLoader(link),
- success: function(){
- removeLoader(link);
- },
- error: function(){
- removeLoader(link);
- alert(Diaspora.I18n.t('failed_to_reshare'));
- }
- });
- }
- }
- }
- });
-
- /* Show comments */
- $("a.show_comments", ".stream").bind("tap click", function(evt){
- evt.preventDefault();
- var link = $(this),
- parent = link.closest(".bottom_bar").first(),
- commentsContainer = function(){ return parent.find(".comment_container").first(); },
- existingCommentsContainer = commentsContainer();
-
- if( link.hasClass('active') ) {
- existingCommentsContainer.hide();
- if(!link.hasClass('bottom_collapse')){
- link.removeClass('active');
- } else {
- parent.find(".show_comments").first().removeClass('active');
- }
-
- $('html,body').scrollTop(parent.offset().top - parent.closest(".stream_element").height() - 8);
-
- } else if( existingCommentsContainer.length > 0) {
-
- if(!existingCommentsContainer.hasClass('noComments')) {
- $.ajax({
- url: link.attr('href'),
- success: function(data){
- parent.append($(data).find('.comments_container').html());
- link.addClass('active');
- existingCommentsContainer.show();
- scrollToOffset(parent, commentsContainer());
- commentsContainer().find('time.timeago').timeago();
- }
- });
- } else {
- existingCommentsContainer.show();
- existingCommentsContainer.find('time.timeago').timeago();
- }
-
- link.addClass('active');
-
- } else {
- $.ajax({
- url: link.attr('href'),
- success: function(data){
- parent.append(data);
- link.addClass('active');
- scrollToOffset(parent, commentsContainer());
- commentsContainer().find('time.timeago').timeago();
- }
- });
- }
- });
-
- var scrollToOffset = function(parent, commentsContainer){
- var commentCount = commentsContainer.find("li.comment").length;
- if( commentCount > 3 ) {
- var lastComment = commentsContainer.find("li:nth-child("+(commentCount-4)+")");
- $('html,body').animate({
- scrollTop: lastComment.offset().top
- }, 1000);
- }
- };
-
- $(".stream").delegate("a.comment_action", "tap click", function(evt){
- evt.preventDefault();
- var link = $(this);
-
- if(link.hasClass('inactive')) {
- var parent = link.closest(".bottom_bar").first(),
- container = link.closest('.bottom_bar').find('.add_comment_bottom_link_container').first();
-
- $.ajax({
- url: link.attr('href'),
- beforeSend: function(){
- link.addClass('loading');
- },
- context: link,
- success: function(data){
- var textarea = function(target) { return target.closest(".stream_element").find('textarea.comment_box').first()[0] };
- link.removeClass('loading');
-
- if(!link.hasClass("add_comment_bottom_link")){
- link.removeClass('inactive');
- }
-
- container.hide();
- parent.append(data);
-
- MBP.autogrow(textarea($(this)));
- }
- });
- }
- });
-
- $(".stream").delegate("a.cancel_new_comment", "tap click", function(evt){
- evt.preventDefault();
- var link = $(this),
- form = link.closest("form"),
- commentActionLink = link.closest(".bottom_bar").find("a.comment_action").first(),
- container = link.closest('.bottom_bar').find('.add_comment_bottom_link_container');
-
- if(container.length > 0 ){
- container.first().show();
- }
-
- commentActionLink.addClass("inactive");
- form.remove();
- });
-
- $(document).on("submit", ".new_comment", function(evt){
- evt.preventDefault();
- var form = $(this);
-
- $.post(form.attr('action')+"?format=mobile", form.serialize(), function(data){
- var bottomBar = form.closest('.bottom_bar').first(),
- container = bottomBar.find('.add_comment_bottom_link_container'),
- commentActionLink = bottomBar.find("a.comment_action").first(),
- reactionLink = bottomBar.find(".show_comments").first(),
- commentCount = bottomBar.find(".comment_count");
-
- if(container.length > 0) {
- container.before(data);
- form.remove();
- container.show();
-
- } else {
- var comments = $("![]()
", {
- src: image.attr("data-small-photo"),
- "data-full-photo": image.attr("data-full-photo")
- });
-
- if(image.attr("data-full-photo") === imageUrl) {
- imageThumb = thumb;
- }
-
- self.imageset.append(thumb);
- });
-
- self
- .selectImage(imageThumb)
- .revealLightbox();
-
- self.scrollToThumbnail(imageThumb);
- };
-
- this.imagesetImageClicked = function(evt) {
- evt.preventDefault();
- evt.stopPropagation();
-
- self.selectImage($(this));
- };
-
- this.scrollToThumbnail = function(imageThumb) {
- self.navigation.animate({scrollLeft: (self.navigation.scrollLeft()
- + imageThumb.offset().left +35 - (self.window.width() / 2))}, 200, 'swing');
- };
-
- this.selectImage = function(imageThumb) {
- $(".selected", self.imageset).removeClass("selected");
- imageThumb.addClass("selected");
- self.image.attr("src", imageThumb.attr("data-full-photo"));
-
- self.scrollToThumbnail(imageThumb);
-
- return self;
- };
-
- this.revealLightbox = function() {
- self.body.addClass("lightboxed");
- self.lightbox
- .css("max-height", (self.window.height() - 100) + "px")
- .show();
-
- return self;
- };
-
- this.resetLightbox = function() {
- self.lightbox.hide();
- self.body.removeClass("lightboxed");
- self.image.attr("src", ImagePaths.get("ajax-loader2.gif"));
- self.imageset.html("");
- };
-
- this.set = function(opts) {
- $.extend(self.options, opts);
- };
- };
-
- Diaspora.Widgets.Lightbox = Lightbox;
-})();
-// @license-end
-
diff --git a/app/assets/javascripts/widgets/timeago.js b/app/assets/javascripts/widgets/timeago.js
index dcb680864..4d159818f 100644
--- a/app/assets/javascripts/widgets/timeago.js
+++ b/app/assets/javascripts/widgets/timeago.js
@@ -7,14 +7,21 @@
(function() {
Diaspora.Widgets.TimeAgo = function() {
this.subscribe("widget/ready", function() {
- if(Diaspora.I18n.language !== "en") {
+ if (Diaspora.I18n.language !== "en") {
$.timeago.settings.lang = Diaspora.I18n.language;
$.timeago.settings.strings[Diaspora.I18n.language] = {};
- $.each($.timeago.settings.strings["en"], function(index) {
- if(index === "numbers") {
+ $.each($.timeago.settings.strings.en, function(index) {
+ if (index === "numbers") {
$.timeago.settings.strings[Diaspora.I18n.language][index] = [];
- }
- else {
+ } else if (index === "minutes" ||
+ index === "hours" ||
+ index === "days" ||
+ index === "months" ||
+ index === "years") {
+ $.timeago.settings.strings[Diaspora.I18n.language][index] = function(value) {
+ return Diaspora.I18n.t("timeago." + index, {count: value});
+ };
+ } else {
$.timeago.settings.strings[Diaspora.I18n.language][index] = Diaspora.I18n.t("timeago." + index);
}
});
diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
new file mode 100644
index 000000000..8bd3810d0
--- /dev/null
+++ b/app/assets/stylesheets/_application.scss
@@ -0,0 +1,114 @@
+@import 'perfect-scrollbar';
+
+@import 'color-variables';
+@import 'bootstrap-complete';
+@import 'mixins';
+
+
+// core
+@import 'media-box';
+@import 'entypo';
+@import 'icons';
+@import 'mentions';
+@import 'animations';
+@import 'flash_messages';
+@import 'sprites';
+@import 'hovercard';
+@import 'base';
+@import 'interactions';
+@import 'spinner';
+@import 'timeago';
+@import 'vendor/fileuploader';
+@import 'vendor/autoSuggest';
+@import 'typeahead';
+@import 'colors';
+@import 'card-footer';
+
+// font overrides
+@import 'typography';
+
+// layout
+@import 'sidebar';
+
+// home
+@import 'home';
+
+// login
+@import 'login';
+@import 'registration';
+@import 'forms';
+
+// terms
+@import 'terms';
+
+// profile and settings pages
+@import 'settings';
+
+// new SPV
+@import 'header';
+@import 'footer';
+@import 'opengraph';
+@import 'single-post-view';
+@import 'poll';
+
+// map
+@import 'leaflet';
+@import 'map';
+
+// conversations
+@import 'conversations';
+
+// publisher
+@import 'publisher';
+@import 'aspects';
+@import 'markdown-editor';
+
+// bookmarklet
+@import 'bookmarklet';
+
+// notifications
+@import 'notifications';
+
+// help
+@import 'help';
+
+// getting started
+@import 'getting-started';
+
+// people
+@import 'people';
+@import 'invitations';
+@import 'profile';
+
+// stream
+@import 'tag';
+@import 'stream';
+@import 'stream_element';
+@import 'comments';
+@import 'diaspora_jsxc';
+@import 'chat';
+@import 'markdown-content';
+@import 'oembed';
+@import 'post-content';
+
+// contacts
+@import 'contacts';
+@import 'navbar_left';
+
+// code
+@import 'code';
+@import 'highlightjs/github';
+
+// statistics
+@import 'statistics';
+
+// gallery
+@import 'blueimp-gallery';
+@import 'blueimp-gallery/blueimp-gallery-indicator';
+@import 'gallery';
+
+// settings
+@import 'user_applications';
+
+// OpenID Connect (API)
+@import 'openid_connect_error_page';
diff --git a/app/assets/stylesheets/_flash_messages.scss b/app/assets/stylesheets/_flash_messages.scss
index e4b4e46c4..379675f81 100644
--- a/app/assets/stylesheets/_flash_messages.scss
+++ b/app/assets/stylesheets/_flash_messages.scss
@@ -1,53 +1,30 @@
-
-@import 'new_styles/animations';
-
-#flash_notice,
-#flash_alert,
-#flash_error {
- position : fixed;
+.flash-body {
+ left: 0;
+ position: fixed;
+ text-align: center;
+ top: -100px;
z-index: 999;
- top : -100px;
- left : 0;
- width : 100%;
+ width: 100%;
+ pointer-events: none;
+ &.expose { @include animation(expose, 10s) }
- text-align : center;
- color: $text-dark-grey;
-
- &.expose {
- @include animation(expose, 10s)
- }
-
- .message {
+ .flash-message {
+ border-radius: 0;
box-shadow: 0 1px 4px rgba(0,0,0,0.8);
-
- display : inline-block;
- padding: 10px 12px;
- min-width: 400px;
- max-width: 800px;
-
- color : #fff;
- background-color : rgba(0,0,0,0.8);
- border : 1px solid rgba(255,255,255,0.7);
- border-radius: 6px;
-
+ display: inline-block;
font-weight: bold;
- font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
- font-size: 13px;
+ max-width: 800px;
+ min-width: 500px;
+ padding: 10px 12px;
+ &.alert-danger { border: 1px solid darken($state-danger-bg, 10%); }
+ &.alert-success { border: 1px solid darken($state-success-bg, 10%); }
+ &.alert-warning { border: 1px solid darken($state-warning-bg, 10%); }
}
-}
-#flash_notice {
- .message {
- color: $text-dark-grey;
- background-color: #F4F899;
- border-color: darken(#F4F899, 40%);
- }
-}
-
-#flash_error,
-#flash_alert {
- .message {
- background-color: #CA410B;
- border-color: darken(#CA410B, 10%);
+ @media (max-width: $grid-float-breakpoint-max) {
+ .flash-message {
+ max-width: 80%;
+ min-width: 80%;
+ }
}
}
diff --git a/app/assets/stylesheets/_mixins.scss b/app/assets/stylesheets/_mixins.scss
index 5c37c1556..2b4c02f90 100644
--- a/app/assets/stylesheets/_mixins.scss
+++ b/app/assets/stylesheets/_mixins.scss
@@ -21,6 +21,9 @@ $default-border-radius: 3px;
@include linear-gradient(lighten($color,20%), darken($color,15%));
}
+@mixin header-gradient($color) {
+ @include linear-gradient(lighten($color, 2%), darken($color, 2%), 0%, 80%);
+}
@mixin linear-gradient($from, $to, $start:0%, $end:100%){
background: mix($from,$to);
@@ -62,7 +65,7 @@ $default-border-radius: 3px;
size : 60px 60px;
}
- border-radius: 70px 10px 10px 70px;
+ border-radius: 40px 10px 10px 40px;
box-shadow: 0 0 32px rgba(255,255,255,.5);
position : absolute;
@@ -70,7 +73,7 @@ $default-border-radius: 3px;
left : 10%;
right : 10%;
- height: 60px;
+ height: 80px;
margin-top: -40px;
padding: 10px 7px 10px 80px;
overflow: hidden;
@@ -117,3 +120,21 @@ $default-border-radius: 3px;
}
}
}
+
+@mixin selectable-list() {
+ .glyphicon-ok,
+ .glyphicon-refresh {
+ display: none;
+ padding-right: 5px;
+ }
+
+ &.selected {
+ .glyphicon-ok { display: inline-block;}
+ .glyphicon-refresh { display: none;}
+ }
+
+ &.loading {
+ .glyphicon-refresh { display: inline-block;}
+ .glyphicon-ok { display: none;}
+ }
+}
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 2084f5e3d..ea933e6e6 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -1,30 +1,8 @@
-@import 'colors';
+@import 'color-variables';
+@import 'bootstrap-variables';
+@import 'animations';
/** ADMIN STYlES **/
-
-body > div.container {
- margin-top: 40px;
- padding-top: 1em;
-}
-
-#admin_nav {
- font-size: 1em;
- border-bottom: 2px solid #777;
- margin-bottom: 20px;
-
- ul {
- display: inline;
- }
-
- li {
- font-size: 0.8em;
- display: inline;
- margin-right: 0.5em;
-
- a { color: $blue; }
- }
-}
-
/** user search **/
.users {
@@ -40,12 +18,56 @@ body > div.container {
height: 50px;
}
- .actions li {
- margin-top: .3em;
- }
+ .actions{ width: 150px; }
+
+ .pull-right .label{ display: inline-block; }
+ }
+}
+
+/** Invites panel **/
+.more_invites{
+ #add-invites-section{
+ line-height: 34px;
+ margin-bottom: 15px;
}
}
/** reported posts **/
-@import 'report'
+@import 'report';
+
+/** pod list **/
+
+#pod-list {
+ .pod-title {
+ max-width: 200px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ th.added,
+ td.added,
+ td.actions { white-space: nowrap; }
+
+ tr.deleting {
+ opacity: .5;
+ }
+
+ tr.checking .recheck i {
+ animation-duration: .4s;
+ animation-name: pulsate;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+
+ td.actions {
+ text-align: right;
+
+ a { color: inherit; }
+ }
+
+ pre.details {
+ margin-top: 1em;
+ white-space: normal;
+ }
+}
diff --git a/app/assets/stylesheets/animations.scss b/app/assets/stylesheets/animations.scss
new file mode 100644
index 000000000..2ef8bee16
--- /dev/null
+++ b/app/assets/stylesheets/animations.scss
@@ -0,0 +1,23 @@
+// flash message animations - header height is about 50px
+@keyframes expose {
+ 0% { top: -100px; }
+ 12% { top: $navbar-height; }
+ 88% { top: $navbar-height; }
+ 100% { top: -100px; }
+}
+
+// spinner animation
+@keyframes spinner {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+}
+
+@keyframes pulsate {
+ from {
+ opacity: 1;
+ }
+
+ to {
+ opacity: .1;
+ }
+}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
deleted file mode 100644
index 427c0d549..000000000
--- a/app/assets/stylesheets/application.scss
+++ /dev/null
@@ -1,98 +0,0 @@
-@import 'bootstrap-fix';
-
-@import 'perfect-scrollbar';
-
-@import "colors";
-@import 'sizes';
-@import 'mixins';
-
-/* core */
-@import 'media-box';
-@import 'autocomplete';
-@import 'entypo-fonts';
-@import 'entypo';
-@import 'mentions';
-@import 'flash_messages';
-@import 'sprites';
-@import 'hovercard';
-@import 'new_styles/base';
-@import 'new_styles/buttons';
-@import 'new_styles/interactions';
-@import 'new_styles/spinner';
-@import 'lightbox';
-@import 'vendor/fileuploader';
-@import 'vendor/autoSuggest';
-
-/* font overrides */
-@import 'new_styles/typography';
-
-/* login */
-@import 'new_styles/login';
-@import 'new_styles/registration';
-@import 'new_styles/forms';
-
-/* navs */
-@import 'new_styles/navs';
-
-/* profile and settings pages */
-@import 'new_styles/settings';
-
-/* new SPV */
-@import 'header';
-@import 'footer';
-@import 'bootstrap-headerfix';
-@import 'opengraph';
-@import 'single-post-view';
-@import 'new_styles/poll';
-
-/* conversations */
-@import 'conversations';
-@import 'jquery.facebox';
-@import 'facebox';
-
-/* publisher */
-@import 'publisher';
-@import 'aspects';
-
-/* bookmarklet */
-@import 'bookmarklet';
-
-/* notifications */
-@import 'notifications';
-
-/* help */
-@import 'help';
-
-/* getting started */
-@import 'getting-started';
-
-/* people */
-@import 'people';
-@import 'invitations';
-@import 'profile';
-
-/* stream */
-@import 'tag';
-@import 'stream-faces';
-@import 'stream';
-@import 'stream_element';
-@import 'comments';
-@import 'diaspora_jsxc';
-@import 'chat';
-@import 'markdown-content';
-@import 'oembed';
-@import 'post-content';
-
-/* right bar */
-@import 'sidebar';
-
-/* contacts */
-@import 'contacts';
-@import 'leftnavbar';
-
-/* code */
-@import 'new_styles/code';
-@import 'highlightjs/github';
-
-/* statistics */
-@import 'statistics';
diff --git a/app/assets/stylesheets/aspects.scss b/app/assets/stylesheets/aspects.scss
index 3c9b1ac22..115e2bcfa 100644
--- a/app/assets/stylesheets/aspects.scss
+++ b/app/assets/stylesheets/aspects.scss
@@ -1,23 +1,14 @@
.aspect_dropdown {
li {
+ @include selectable-list;
+
.status_indicator {
width: 19px;
height: 14px;
display: inline-block;
}
- .icon-ok, .icon-refresh {
- padding-right: 5px;
- display: none;
- }
- &.selected {
- .icon-ok { display: inline-block;}
- .icon-refresh { display: none;}
- }
- &.loading {
- .icon-refresh { display: inline-block;}
- .icon-ok { display: none;}
- }
+
a {
.text {
color: #333333;
diff --git a/app/assets/stylesheets/autocomplete.scss b/app/assets/stylesheets/autocomplete.scss
deleted file mode 100644
index c23205248..000000000
--- a/app/assets/stylesheets/autocomplete.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-.ac_results {
- border: 1px solid #999;
- background-color: transparent;
- overflow: hidden;
- z-index: 99999;
- min-width: 300px !important;
- width: 100%;
-
- border-radius: 3px;
- box-shadow: 0 1px 3px #999;
-}
-
-.ac_results ul {
- width: 100%;
- list-style-position: outside;
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
-.ac_results li {
- margin: 0px;
- padding: 2px 5px {
- left: 50px;
- top: 6px;
- }
- cursor: default;
- display: block;
- height: 37px;
- position: relative;
- // if width will be 100% horizontal scrollbar will apear
- // when scroll mode will be used
- // width 100%
- font: menu;
- font-size: 1em;
- // it is very important, if line-height not setted or setted
- // in relative units scroll will be broken in firefox
- //:line-height 16px
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
-
-.ac_loading {
- background: white image-url('ajax-loader.gif') right center no-repeat;
-}
-
-.ac_odd {
- background-color: #fafafa;
- background-color: rgba(250,250,250,0.95);
-}
-
-.ac_even {
- background-color: #fff;
- background-color: rgba(255,255,255,0.95);
-}
-
-.ac_over {
- background-color: #3F8FBA;
- color: white;
-}
-
-.ac_results {
- .avatar {
- height: 35px;
- width: 35px;
- position: absolute;
- left: 5px;
- top: 5px;
- }
-
- .search_handle {
- font-size: 0.8em;
- color: #999;
- margin-top: -3px;
- }
-
- .ac_over .search_handle{
- color: #fff;
- }
-
- .ac_over .search_handle, .search_handle {
- display: block;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-}
diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
new file mode 100644
index 000000000..e9a7762e9
--- /dev/null
+++ b/app/assets/stylesheets/base.scss
@@ -0,0 +1,117 @@
+body {
+ margin-top: $navbar-height;
+ padding: none;
+}
+
+.container-fluid { max-width: $screen-lg-min; }
+
+// These names are generated by a rails controller
+// scss-lint:disable SelectorFormat
+.page-contacts,
+.page-conversations,
+.page-notifications,
+.page-people.action-show,
+.page-people.action-contacts,
+.page-photos,
+.page-posts,
+.page-profiles.action-edit,
+.page-services.action-index,
+.page-streams,
+.page-tags,
+.page-user_applications,
+.page-users.action-edit,
+.page-users.action-update,
+.page-users.action-privacy_settings {
+ background-color: $main-background;
+}
+// scss-lint:enable SelectorFormat
+
+// Overflow
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+code,
+pre { word-wrap: break-word; }
+
+.tag { word-break: break-all; }
+
+.avatar {
+ border-radius: 4px;
+
+ &.micro {
+ height: 20px;
+ width: 20px;
+ }
+
+ &.small {
+ height: 35px;
+ width: 35px;
+ }
+
+ &.medium {
+ height: auto;
+ max-width: 75px;
+ width: auto;
+ }
+}
+
+.author-name {
+ color: inherit;
+}
+
+.back-to-top {
+ background-color: $border-dark-grey;
+ border-radius: 4px;
+ bottom: 20px;
+ color: $white;
+ display: block;
+ font-size: 3.5em;
+ height: 50px;
+ line-height: 50px;
+ opacity: 0;
+ position: fixed;
+ right: 54px;
+ transition: opacity ease 400ms;
+ width: 50px;
+ z-index: 49;
+
+ &:hover,
+ &.visible:hover {
+ color: $white;
+ opacity: .85;
+ text-decoration: none;
+ }
+
+ &.visible { opacity: .5; }
+}
+
+.noscript {
+ background-color: rgba($black, .9);
+ height: 100%;
+ margin-top: -50px;
+ position: fixed;
+ width: 100%;
+ z-index: 9001;
+
+ h3 {
+ background-color: $white;
+ margin: 100px;
+ padding: 50px;
+ }
+}
+
+// general purpose classes
+
+.small-horizontal-spacer {
+ min-height: 20px;
+}
+
+// badge color
+.badge-important {
+ background-color: $red;
+}
diff --git a/app/assets/stylesheets/bookmarklet.scss b/app/assets/stylesheets/bookmarklet.scss
index 42c2dadbd..ecdaff4b6 100644
--- a/app/assets/stylesheets/bookmarklet.scss
+++ b/app/assets/stylesheets/bookmarklet.scss
@@ -1,2 +1,2 @@
-#bookmarklet { padding:10px 10px 30px 10px; margin-top: 0; }
-body.page-status_messages.action-bookmarklet { margin-top: 0px }
\ No newline at end of file
+#bookmarklet { padding-bottom: 30px; margin-top: 0; }
+body.page-status_messages.action-bookmarklet { margin-top: 0px }
diff --git a/app/assets/stylesheets/bootstrap-complete.scss b/app/assets/stylesheets/bootstrap-complete.scss
index 7e36e3854..df03c6ad0 100644
--- a/app/assets/stylesheets/bootstrap-complete.scss
+++ b/app/assets/stylesheets/bootstrap-complete.scss
@@ -1,9 +1,8 @@
// Calling this file bootstrap would cause an infinite recursion during asset compilation.
-@import 'bootstrap';
-@import 'bootstrap-responsive';
+@import "bootstrap-sprockets";
+@import "bootstrap-variables"; //our overwrites of bootstrap variables
+@import "bootstrap";
+// Plugins
-// according to the docs, this is part of bootstrap 2.3.x
-.text-left { text-align: left; }
-.text-center { text-align: center; }
-.text-right { text-align: right; }
+@import "bootstrap3-switch";
diff --git a/app/assets/stylesheets/bootstrap-fix.scss b/app/assets/stylesheets/bootstrap-fix.scss
deleted file mode 100644
index 47b6c0c4d..000000000
--- a/app/assets/stylesheets/bootstrap-fix.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// A temporary fix for broken classes in bootstrap 2.
-// Can probably be removed when migration of bootstrap 3 is done.
-
-input::placeholder,
-textarea::placeholder {
- color: #999999;
-}
-input::input-placeholder,
-textarea::input-placeholder {
- color: #999999;
-}
-
-
-// A temporary fix for mention modal #5329
-
-#new_status_message_pane .modal {
- position: absolute;
- max-height: none;
-}
-
-#new_status_message_pane .modal-body{
- overflow-y: visible;
- max-height: none;
-}
diff --git a/app/assets/stylesheets/bootstrap-headerfix.scss b/app/assets/stylesheets/bootstrap-headerfix.scss
deleted file mode 100644
index 53f4919dc..000000000
--- a/app/assets/stylesheets/bootstrap-headerfix.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-// A temporary fix for displaying the header in the single post view.
-// Should be removed once everything uses Bootstrap.
-
-header {
- .container {
- width: 950px;
- .header-nav {
- span {
- a {
- font-weight: bold;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- }
- }
- }
- li {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- }
- }
- #conversations_badge, #notification_badge {
- background: none;
- }
- #notification_badge.active {
- border-radius: 0;
- }
- #global_search {
- form {
- input {
- height: 15px;
- color: black;
- }
- }
- }
- #notification_dropdown {
- h4 {
- margin: 0;
- }
- .right {
- a {
- font-weight: bold;
- }
- }
- .notification_element {
- font-size: 13px;
- .timeago {
- border: medium none;
- cursor: text;
- }
- }
- }
-}
diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss
new file mode 100644
index 000000000..bca512cff
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap-variables.scss
@@ -0,0 +1,866 @@
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4):
+
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+$gray-base: #000;
+// $gray-darker: lighten($gray-base, 13.5%) // #222
+// $gray-dark: lighten($gray-base, 20%) // #333
+$gray: lighten($gray-base, 33.5%); // #555
+// $gray-light: lighten($gray-base, 46.7%) // #777
+// $gray-lighter: lighten($gray-base, 93.5%) // #eee
+
+$brand-primary: darken(#0097FF,5%) !default; // darker creation-blue
+$brand-success: #8EDE3D !default;
+// $brand-info: #5bc0de
+// $brand-warning: #f0ad4e
+// $brand-danger: #d9534f
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for ``.
+// $body-bg: #fff
+//** Global text color on ``.
+// $text-color: $gray-dark
+
+//** Global textual link color.
+$link-color: rgb(42,156,235) !default;
+//** Link hover color set via `darken()` function.
+// $link-hover-color: darken($link-color, 15%)
+//** Link hover decoration.
+// $link-hover-decoration: underline
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif
+// $font-family-serif: Georgia, "Times New Roman", Times, serif
+//** Default monospace fonts for `
' +
- '
';
- this.$el.html(content);
- } else {
- this.$el.html('');
- this.renderContacts();
- }
+ this.fetchContacts();
},
- renderContacts: function() {
+ fetchContacts: function() {
this.$el.addClass("loading");
- var content = document.createDocumentFragment();
- _.rest(_.first(this.resultList , this.itemCount + this.perPage), this.itemCount).forEach( function(item) {
- var view = new app.views.Contact({model: item});
- content.appendChild(view.render().el);
+ $("#paginate .loader").removeClass("hidden");
+ $.ajax(this._fetchUrl(), {
+ context: this
+ }).success(function(response) {
+ if (response.length === 0) {
+ this.onEmptyResponse();
+ } else {
+ this.appendContactViews(response);
+ this.page++;
+ }
});
+ },
- var size = _.size(this.resultList);
- if( this.itemCount + this.perPage >= size ){
- this.itemCount = size;
- this.off('renderContacts');
- } else {
- this.itemCount += this.perPage;
+ _fetchUrl: function() {
+ var url = Routes.contacts({format: "json", page: this.page});
+ if (this.urlParams) {
+ url += "&" + this.urlParams;
}
+ return url;
+ },
+
+ onEmptyResponse: function() {
+ if (this.collection.length === 0) {
+ var content = document.createDocumentFragment();
+ content = "' + - Diaspora.I18n.t('contacts.search_no_results') + - '
' + - '" +
+ "
";
+ this.$el.html(content);
+ }
+ this.off("fetchContacts");
+ this.$el.removeClass("loading");
+ $("#paginate .loader").addClass("hidden");
+ },
+
+ appendContactViews: function(contacts) {
+ var content = document.createDocumentFragment();
+ contacts.forEach(function(contactData) {
+ var contact = new app.models.Contact(contactData);
+ this.collection.add(contact);
+ var view = new app.views.Contact({model: contact});
+ content.appendChild(view.render().el);
+ }.bind(this));
this.$el.append(content);
this.$el.removeClass("loading");
- },
-
- search: function(query) {
- query = query.trim();
- if( query || this.query ) {
- this.off('renderContacts');
- this.on('renderContacts', this.renderContacts, this);
- this.itemCount = 0;
- if( query ) {
- this.query = query;
- var regex = new RegExp(query,'i');
- this.resultList = this.collection.filter(function(contact) {
- return regex.test(contact.get('person').name) ||
- regex.test(contact.get('person').diaspora_id);
- });
- } else {
- this.resultList = this.collection.toArray();
- this.query = '';
- }
- this.render();
- }
+ $("#paginate .loader").addClass("hidden");
},
infScroll: function() {
- if( this.$el.hasClass('loading') ) return;
+ if (this.$el.hasClass("loading")) {
+ return;
+ }
var distanceTop = $(window).height() + $(window).scrollTop(),
distanceBottom = $(document).height() - distanceTop;
- if(distanceBottom < 300) this.trigger('renderContacts');
+ if (distanceBottom < 300) {
+ this.trigger("fetchContacts");
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/contact_view.js b/app/assets/javascripts/app/views/contact_view.js
index 840edfe46..1a0a676d6 100644
--- a/app/assets/javascripts/app/views/contact_view.js
+++ b/app/assets/javascripts/app/views/contact_view.js
@@ -3,6 +3,10 @@
app.views.Contact = app.views.Base.extend({
templateName: 'contact',
+ subviews: {
+ ".aspect_membership_dropdown": "AspectMembershipView"
+ },
+
events: {
"click .contact_add-to-aspect" : "addContactToAspect",
"click .contact_remove-from-aspect" : "removeContactFromAspect"
@@ -10,6 +14,12 @@ app.views.Contact = app.views.Base.extend({
tooltipSelector: '.contact_add-to-aspect, .contact_remove-from-aspect',
+ initialize: function() {
+ this.AspectMembershipView = new app.views.AspectMembership(
+ {person: _.extend(this.model.get("person"), {contact: this.model})}
+ );
+ },
+
presenter: function() {
return _.extend(this.defaultPresenter(), {
person_id : this.model.get('person_id'),
@@ -18,52 +28,51 @@ app.views.Contact = app.views.Base.extend({
});
},
- postRenderTemplate: function() {
- var self = this;
- var dropdownEl = this.$('.aspect_membership_dropdown.placeholder');
- if( dropdownEl.length === 0 ) {
- return;
- }
-
- // TODO render me client side!!!
- var href = this.model.person.url() + '/aspect_membership_button?size=small';
-
- $.get(href, function(resp) {
- dropdownEl.html(resp);
- new app.views.AspectMembership({el: $('.aspect_dropdown',dropdownEl)});
-
- // UGLY (re-)attach the facebox
- self.$('a[rel*=facebox]').facebox();
- });
- },
-
addContactToAspect: function(){
var self = this;
- this.model.aspect_memberships.create({
- 'person_id': this.model.get('person_id'),
- 'aspect_id': app.aspect.get('id')
+ // do we create the first aspect membership for this person?
+ var startSharing = this.model.aspectMemberships.length === 0;
+ this.model.aspectMemberships.create({
+ "person_id": this.model.get("person_id"),
+ "aspect_id": app.aspect.get("id")
},{
success: function(){
+ app.events.trigger("aspect_membership:create", {
+ membership: {
+ aspectId: app.aspect.get("id"),
+ personId: self.model.get("person_id")
+ },
+ startSharing: startSharing
+ });
self.render();
},
error: function(){
- var msg = Diaspora.I18n.t('contacts.error_add', { 'name': self.model.get('person').name });
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':msg });
+ var msg = Diaspora.I18n.t("contacts.error_add", { "name": self.model.get("person").name });
+ app.flashMessages.error(msg);
}
});
},
removeContactFromAspect: function(){
var self = this;
- this.model.aspect_memberships
- .find(function(membership){ return membership.get('aspect').id === app.aspect.id; })
+ // do we destroy the last aspect membership for this person?
+ var stopSharing = this.model.aspectMemberships.length <= 1;
+ this.model.aspectMemberships
+ .find(function(membership){ return membership.get("aspect").id === app.aspect.id; })
.destroy({
success: function(){
+ app.events.trigger("aspect_membership:destroy", {
+ membership: {
+ aspectId: app.aspect.get("id"),
+ personId: self.model.get("person_id")
+ },
+ stopSharing: stopSharing
+ });
self.render();
},
error: function(){
- var msg = Diaspora.I18n.t('contacts.error_remove', { 'name': self.model.get('person').name });
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':msg });
+ var msg = Diaspora.I18n.t("contacts.error_remove", { "name": self.model.get("person").name });
+ app.flashMessages.error(msg);
}
});
}
diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js
index e93f6bfa6..76fb62739 100644
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -29,7 +29,6 @@ app.views.Content = app.views.Base.extend({
return photos;
},
-
expandPost: function(evt) {
var el = $(this.el).find('.collapsible');
el.removeClass('collapsed').addClass('opened');
@@ -40,8 +39,8 @@ app.views.Content = app.views.Base.extend({
},
location: function(){
- var address = this.model.get('address')? this.model.get('address') : '';
- return address;
+ var location = this.model.get("location")? this.model.get("location") : "";
+ return location;
},
collapseOversized : function() {
@@ -73,6 +72,25 @@ app.views.Content = app.views.Base.extend({
postRenderTemplate : function(){
_.defer(_.bind(this.collapseOversized, this));
+
+ // run collapseOversized again after all contained images are loaded
+ var self = this;
+ _.defer(function() {
+ self.$("img").each(function() {
+ this.addEventListener("load", function() {
+ // only fire if the top of the post is in viewport
+ var rect = self.el.getBoundingClientRect();
+ if(rect.top > 0) {
+ self.collapseOversized.call(self);
+ }
+ });
+ });
+ });
+
+ var photoAttachments = this.$(".photo_attachments");
+ if(photoAttachments.length > 0) {
+ new app.views.Gallery({ el: photoAttachments });
+ }
}
});
@@ -82,6 +100,10 @@ app.views.StatusMessage = app.views.Content.extend({
app.views.ExpandedStatusMessage = app.views.StatusMessage.extend({
postRenderTemplate : function(){
+ var photoAttachments = this.$(".photo_attachments");
+ if(photoAttachments.length > 0) {
+ new app.views.Gallery({ el: photoAttachments });
+ }
}
});
@@ -147,4 +169,5 @@ app.views.SPVOpenGraph = app.views.OpenGraph.extend({
// override with nothing
}
});
+
// @license-end
diff --git a/app/assets/javascripts/app/views/conversations_form_view.js b/app/assets/javascripts/app/views/conversations_form_view.js
index 5289241dc..53dbee681 100644
--- a/app/assets/javascripts/app/views/conversations_form_view.js
+++ b/app/assets/javascripts/app/views/conversations_form_view.js
@@ -33,6 +33,7 @@ app.views.ConversationsForm = Backbone.View.extend({
emptyText: Diaspora.I18n.t("no_results"),
preFill: this.prefill
}).focus();
+ $("#contact_ids").attr("aria-labelledby", "toLabel");
},
displayNoContactsMessage: function() {
@@ -42,7 +43,7 @@ app.views.ConversationsForm = Backbone.View.extend({
},
keyDown : function(evt) {
- if( evt.keyCode === 13 && evt.ctrlKey ) {
+ if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
$(evt.target).parents("form").submit();
}
}
diff --git a/app/assets/javascripts/app/views/conversations_view.js b/app/assets/javascripts/app/views/conversations_view.js
index cd4addf41..d5ed22a3a 100644
--- a/app/assets/javascripts/app/views/conversations_view.js
+++ b/app/assets/javascripts/app/views/conversations_view.js
@@ -24,10 +24,10 @@ app.views.Conversations = Backbone.View.extend({
$(".control-icons a").tooltip({placement: "bottom"});
var conv = $(".conversation-wrapper .stream_element.selected"),
- cBadge = $("#conversations_badge .badge_count");
+ cBadge = $("#conversations-link .badge");
if(conv.hasClass("unread") ){
- var unreadCount = parseInt(conv.find(".unread_message_count").text(), 10);
+ var unreadCount = parseInt(conv.find(".unread-message-count").text(), 10);
if(cBadge.text() !== "") {
cBadge.text().replace(/\d+/, function(num){
@@ -40,7 +40,7 @@ app.views.Conversations = Backbone.View.extend({
});
}
conv.removeClass("unread");
- conv.find(".unread_message_count").remove();
+ conv.find(".unread-message-count").remove();
var pos = $("#first_unread").offset().top - 50;
$("html").animate({scrollTop:pos});
@@ -50,7 +50,7 @@ app.views.Conversations = Backbone.View.extend({
},
keyDown : function(evt) {
- if( evt.keyCode === 13 && evt.ctrlKey ) {
+ if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
$(evt.target).parents("form").submit();
}
}
diff --git a/app/assets/javascripts/app/views/feedback_view.js b/app/assets/javascripts/app/views/feedback_view.js
index 938469bbb..70bf4ca6d 100644
--- a/app/assets/javascripts/app/views/feedback_view.js
+++ b/app/assets/javascripts/app/views/feedback_view.js
@@ -11,13 +11,13 @@ app.views.Feedback = app.views.Base.extend({
"click .post_report" : "report",
"click .block_user" : "blockUser",
- "click .hide_post" : "hidePost",
+ "click .hide_post" : "hidePost"
},
tooltipSelector : ".label",
initialize : function() {
- this.model.interactions.on('change', this.render, this);
+ this.model.interactions.on("change", this.render, this);
this.initViews && this.initViews(); // I don't know why this was failing with $.noop... :(
},
@@ -47,7 +47,7 @@ app.views.Feedback = app.views.Base.extend({
blockUser: function(evt) {
if(evt) { evt.preventDefault(); }
- if(!confirm(Diaspora.I18n.t('ignore_user'))) { return; }
+ if(!confirm(Diaspora.I18n.t("ignore_user"))) { return; }
this.model.blockAuthor()
.done(function() {
@@ -55,16 +55,13 @@ app.views.Feedback = app.views.Base.extend({
document.location.href = "/stream";
})
.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('hide_post_failed')
- });
+ app.flashMessages.error(Diaspora.I18n.t("hide_post_failed"));
});
},
hidePost : function(evt) {
if(evt) { evt.preventDefault(); }
- if(!confirm(Diaspora.I18n.t('hide_post'))) { return; }
+ if(!confirm(Diaspora.I18n.t("hide_post"))) { return; }
$.ajax({
url : "/share_visibilities/42",
@@ -77,11 +74,8 @@ app.views.Feedback = app.views.Base.extend({
document.location.href = "/stream";
})
.fail(function() {
- Diaspora.page.flashMessages.render({
- success: false,
- notice: Diaspora.I18n.t('ignore_post_failed')
- });
+ app.flashMessages.error(Diaspora.I18n.t("ignore_post_failed"));
});
- },
+ }
});
// @license-end
diff --git a/app/assets/javascripts/app/views/flash_messages_view.js b/app/assets/javascripts/app/views/flash_messages_view.js
new file mode 100644
index 000000000..cb5b214b2
--- /dev/null
+++ b/app/assets/javascripts/app/views/flash_messages_view.js
@@ -0,0 +1,20 @@
+app.views.FlashMessages = app.views.Base.extend({
+ templateName: "flash_messages",
+
+ _flash: function(message, error){
+ this.presenter = {
+ message: message,
+ alertLevel: error ? "alert-danger" : "alert-success"
+ };
+
+ this.renderTemplate();
+ },
+
+ success: function(message){
+ this._flash(message, false);
+ },
+
+ error: function(message){
+ this._flash(message, true);
+ }
+});
diff --git a/app/assets/javascripts/app/views/gallery_view.js b/app/assets/javascripts/app/views/gallery_view.js
new file mode 100644
index 000000000..6af577419
--- /dev/null
+++ b/app/assets/javascripts/app/views/gallery_view.js
@@ -0,0 +1,42 @@
+app.views.Gallery = app.views.Base.extend({
+ events: {
+ "click a.gallery-picture": "showGallery"
+ },
+
+ pictures: function(){
+ return this.$el.find("a.gallery-picture");
+ },
+
+ showGallery: function(event){
+ event = event || window.event;
+ var target = event.target || event.srcElement;
+ var link = target.src ? target.parentNode : target;
+ var links = this.pictures();
+ blueimp.Gallery(links, this.options(event, link));
+ },
+
+ preventHideControls: function(){
+ var lightbox = $("#blueimp-gallery");
+ var onEvent = function(ev){
+ if($(ev.target).hasClass("slide-content")){
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
+ };
+
+ lightbox.find(".slide").click(onEvent);
+ },
+
+ options: function(event, link) {
+ return {
+ index: link,
+ event: event,
+ hidePageScrollbars: false,
+ disableScroll: true,
+ continuous: true,
+ toggleControlsOnReturn: false,
+ onopened: this.preventHideControls,
+ slideshowInterval: 2000
+ };
+ }
+});
diff --git a/app/assets/javascripts/app/views/header_view.js b/app/assets/javascripts/app/views/header_view.js
index 814ef3a87..5b682c3b3 100644
--- a/app/assets/javascripts/app/views/header_view.js
+++ b/app/assets/javascripts/app/views/header_view.js
@@ -6,48 +6,18 @@ app.views.Header = app.views.Base.extend({
className: "dark-header",
- events: {
- "click ul.dropdown li:first-child": "toggleUserDropdown",
- "focusin #q": "toggleSearchActive",
- "focusout #q": "toggleSearchActive"
- },
-
- initialize: function(){
- $(document.body).click($.proxy(this.hideUserDropdown, this));
-
- return this;
+ presenter: function() {
+ return _.extend({}, this.defaultPresenter(), {
+ podname: gon.appConfig.settings.podname
+ });
},
postRenderTemplate: function(){
- new app.views.Notifications({ el: '#notification_dropdown' });
- new app.views.NotificationDropdown({ el: '#notification_badge' });
- new app.views.Search({ el: '#header-search-form' });
+ new app.views.Notifications({ el: "#notification-dropdown" });
+ this.notificationDropdown = new app.views.NotificationDropdown({ el: "#notification-dropdown" });
+ new app.views.Search({ el: "#header-search-form" });
},
menuElement: function(){ return this.$("ul.dropdown"); },
-
- toggleUserDropdown: function(evt){
- if(evt){ evt.preventDefault(); }
-
- this.menuElement().toggleClass("active");
-
- if($.browser.msie){
- this.$("header").toggleClass('ie-user-menu-active');
- }
- },
-
- hideUserDropdown: function(evt){
- if(this.menuElement().hasClass("active") && !$(evt.target).parents("#user_menu").length){
- this.menuElement().removeClass("active");
- }
- },
-
- toggleSearchActive: function(ev){
- // jQuery produces two events for focus/blur (for bubbling)
- // don't rely on which event arrives first, by allowing for both variants
- var is_active = (_.indexOf(['focus','focusin'], ev.type) !== -1);
- $(ev.target).toggleClass('active', is_active);
- return false;
- }
});
// @license-end
diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js
index f1ec4618f..48731e55c 100644
--- a/app/assets/javascripts/app/views/help_view.js
+++ b/app/assets/javascripts/app/views/help_view.js
@@ -210,15 +210,15 @@ app.views.Help = app.views.StaticContentView.extend({
},
chatEnabled: function(){
- return gon.chatEnabled;
+ return gon.appConfig.chat.enabled;
},
getChatIcons: function(){
- return '';
+ return "";
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js
index 238952154..93f9ffa62 100644
--- a/app/assets/javascripts/app/views/hovercard_view.js
+++ b/app/assets/javascripts/app/views/hovercard_view.js
@@ -4,13 +4,15 @@ app.views.Hovercard = app.views.Base.extend({
templateName: 'hovercard',
id: 'hovercard_container',
+ subviews: {
+ "#hovercard_dropdown_container": "aspectMembershipDropdown"
+ },
+
events: {
'mouseleave': '_mouseleaveHandler'
},
initialize: function() {
- this.render();
-
$(document)
.on('mouseenter', '.hovercardable', _.bind(this._mouseenterHandler, this))
.on('mouseleave', '.hovercardable', _.bind(this._mouseleaveHandler, this));
@@ -18,18 +20,18 @@ app.views.Hovercard = app.views.Base.extend({
this.showMe = false;
this.parent = null; // current 'hovercardable' element that caused HC to appear
- // cache some element references
- this.avatar = this.$('.avatar');
- this.avatarLink = this.$("a.person_avatar");
- this.dropdown_container = this.$('#hovercard_dropdown_container');
- this.hashtags = this.$('.hashtags');
- this.person_link = this.$('a.person');
- this.person_handle = this.$('div.handle');
this.active = true;
},
postRenderTemplate: function() {
- this.$el.appendTo($('body'));
+ this.$el.appendTo($("body"));
+
+ // cache some element references
+ this.avatar = this.$(".avatar");
+ this.avatarLink = this.$("a.person_avatar");
+ this.hashtags = this.$(".hashtags");
+ this.personLink = this.$("a.person");
+ this.personID = this.$("div.handle");
},
deactivate: function() {
@@ -73,7 +75,6 @@ app.views.Hovercard = app.views.Base.extend({
this.$el.hide();
}
- this.dropdown_container.unbind().empty();
return false;
},
@@ -102,6 +103,12 @@ app.views.Hovercard = app.views.Base.extend({
throw new Error("received data is not a person object");
}
+ if (app.currentUser.authenticated()) {
+ self.aspectMembershipDropdown = new app.views.AspectMembership({person: new app.models.Person(person)});
+ }
+
+ self.render();
+
self._populateHovercardWith(person);
if( !self.showMe ) {
// mouse has left element
@@ -112,29 +119,20 @@ app.views.Hovercard = app.views.Base.extend({
},
_populateHovercardWith: function(person) {
- var self = this;
+ this.avatarLink.attr("href", this.href());
+ this.personLink.attr("href", this.href());
+ this.personLink.text(person.name);
+ this.personID.text(person.diaspora_id);
- this.avatar.attr('src', person.avatar);
- this.avatarLink.attr("href", person.url);
- this.person_link.attr('href', person.url);
- this.person_link.text(person.name);
- this.person_handle.text(person.handle);
+ if (person.profile) {
+ this.avatar.attr("src", person.profile.avatar);
- // set hashtags
- this.hashtags.empty();
- this.hashtags.html( $(_.map(person.tags, function(tag){
- return $('',{href: "/tags/"+tag.substring(1)}).text(tag)[0] ;
- })) );
-
- if(!app.currentUser.authenticated()){ return; }
- // set aspect dropdown
- // TODO render me client side!!!
- var href = this.href();
- href += "/aspect_membership_button";
- $.ajax(href, {preventGlobalErrorHandling: true}).done(function(response){
- self.dropdown_container.html(response);
- });
- new app.views.AspectMembership({el: self.dropdown_container});
+ // set hashtags
+ this.hashtags.empty();
+ this.hashtags.html($(_.map(person.profile.tags, function(tag) {
+ return $("", {href: "/tags/" + tag.substring(1)}).text(tag)[0];
+ })));
+ }
},
_positionHovercard: function() {
diff --git a/app/assets/javascripts/app/views/infinite_stream_view.js b/app/assets/javascripts/app/views/infinite_stream_view.js
index 1716eefb7..d5783d559 100644
--- a/app/assets/javascripts/app/views/infinite_stream_view.js
+++ b/app/assets/javascripts/app/views/infinite_stream_view.js
@@ -16,6 +16,7 @@ app.views.InfScroll = app.views.Base.extend({
this.showLoader();
this.bind("loadMore", this.fetchAndshowLoader, this);
this.stream.bind("fetched", this.finishedLoading, this);
+ this.stream.bind("allItemsLoaded", this.showNoPostsInfo, this);
this.stream.bind("allItemsLoaded", this.unbindInfScroll, this);
this.collection.bind("add", this.addPostView, this);
@@ -29,10 +30,6 @@ app.views.InfScroll = app.views.Base.extend({
this.prependedPosts = document.createDocumentFragment();
},
- postRenderTemplate : function() {
- if(this.stream.isFetching()) { this.showLoader() }
- },
-
createPostView : function(post){
var postView = new this.postClass({ model: post, stream: this.stream });
if (this.collection.at(0).id === post.id) {
@@ -54,6 +51,13 @@ app.views.InfScroll = app.views.Base.extend({
}
},
+ showNoPostsInfo: function() {
+ if (this.postViews.length === 0) {
+ var noPostsInfo = new app.views.NoPostsInfo();
+ this.$el.append(noPostsInfo.render().el);
+ }
+ },
+
unbindInfScroll : function() {
$(window).unbind("scroll");
},
@@ -86,6 +90,7 @@ app.views.InfScroll = app.views.Base.extend({
this.$el.prepend(this.prependedPosts);
this.$el.append(this.appendedPosts);
this._resetPostFragments();
+ this.postRenderTemplate();
},
finishedLoading: function() {
diff --git a/app/assets/javascripts/app/views/likes_info_view.js b/app/assets/javascripts/app/views/likes_info_view.js
index a672645dd..9300ac9ad 100644
--- a/app/assets/javascripts/app/views/likes_info_view.js
+++ b/app/assets/javascripts/app/views/likes_info_view.js
@@ -5,26 +5,32 @@ app.views.LikesInfo = app.views.Base.extend({
templateName : "likes-info",
events : {
- "click .expand_likes" : "showAvatars"
+ "click .expand-likes" : "showAvatars"
},
tooltipSelector : ".avatar",
initialize : function() {
this.model.interactions.bind('change', this.render, this);
+ this.displayAvatars = false;
},
presenter : function() {
return _.extend(this.defaultPresenter(), {
likes : this.model.interactions.likes.toJSON(),
likesCount : this.model.interactions.likesCount(),
- likes_fetched : this.model.interactions.get("fetched"),
+ displayAvatars : this.model.interactions.get("fetched") && this.displayAvatars
});
},
showAvatars : function(evt){
if(evt) { evt.preventDefault() }
- this.model.interactions.fetch();
+ this.displayAvatars = true;
+ if(!this.model.interactions.get("fetched")){
+ this.model.interactions.fetch();
+ } else {
+ this.model.interactions.trigger("change");
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/location_stream.js b/app/assets/javascripts/app/views/location_stream.js
index fd6fae946..925ee1f2f 100644
--- a/app/assets/javascripts/app/views/location_stream.js
+++ b/app/assets/javascripts/app/views/location_stream.js
@@ -1,7 +1,31 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.LocationStream = app.views.Content.extend({
- templateName: "status-message-location"
+ events: {
+ "click .near-from": "toggleMap"
+ },
+ templateName: "status-message-location",
+
+ toggleMap: function () {
+ var mapContainer = this.$el.find(".mapContainer");
+
+ if (mapContainer.hasClass("empty")) {
+ var location = this.model.get("location");
+ mapContainer.css("height", "150px");
+
+ if (location.lat) {
+ var map = L.map(mapContainer[0]).setView([location.lat, location.lng], 14);
+ var tiles = app.helpers.locations.getTiles();
+
+ tiles.addTo(map);
+
+ L.marker(location).addTo(map);
+ mapContainer.removeClass("empty");
+ return map;
+ }
+ } else {
+ mapContainer.toggle();
+ }
+ }
});
// @license-end
-
diff --git a/app/assets/javascripts/app/views/location_view.js b/app/assets/javascripts/app/views/location_view.js
deleted file mode 100644
index 0fe6be15d..000000000
--- a/app/assets/javascripts/app/views/location_view.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-app.views.Location = Backbone.View.extend({
-
- el: "#location",
-
- initialize: function(){
- this.render();
- this.getLocation();
- },
-
- render: function(){
- $(this.el).append('" + + Diaspora.I18n.t("contacts.search_no_results") + + "
" + + "');
- },
-
- getLocation: function(){
- var element = this.el;
-
- var locator = new OSM.Locator();
- locator.getAddress(function(address, latlng){
- $(element).html('');
- $('#location_coords').val(latlng.latitude + "," + latlng.longitude);
- });
- },
-});
-// @license-end
-
diff --git a/app/assets/javascripts/app/views/locator.js b/app/assets/javascripts/app/views/locator.js
new file mode 100644
index 000000000..364f3fa39
--- /dev/null
+++ b/app/assets/javascripts/app/views/locator.js
@@ -0,0 +1,33 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.views.Location = Backbone.View.extend({
+
+ el: "#location",
+
+ initialize: function(){
+ this.render();
+ this.getLocation();
+ },
+
+ render: function() {
+ $("").appendTo(this.el);
+ },
+
+ getLocation: function(){
+ var element = this.el ;
+
+ var locator = new OSM.Locator();
+ locator.getAddress(function(address, latlng){
+ $(element).empty();
+ $("",
+ { id: "location_address",
+ value: address,
+ type: "text",
+ class: "input-block-level form-control"
+ }).appendTo($(element));
+
+ $("#location_coords").val(latlng.latitude + "," + latlng.longitude);
+ });
+ }
+});
+// @license-end
diff --git a/app/assets/javascripts/app/views/no_posts_info_view.js b/app/assets/javascripts/app/views/no_posts_info_view.js
new file mode 100644
index 000000000..57894b9f0
--- /dev/null
+++ b/app/assets/javascripts/app/views/no_posts_info_view.js
@@ -0,0 +1,3 @@
+app.views.NoPostsInfo = app.views.Base.extend({
+ templateName: "no_posts_info"
+});
diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js
index 117c29d84..3fec6a793 100644
--- a/app/assets/javascripts/app/views/notification_dropdown_view.js
+++ b/app/assets/javascripts/app/views/notification_dropdown_view.js
@@ -1,8 +1,8 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.NotificationDropdown = app.views.Base.extend({
- events:{
- "click #notifications-badge": "toggleDropdown"
+ events: {
+ "click #notifications-link": "toggleDropdown"
},
initialize: function(){
@@ -12,49 +12,46 @@ app.views.NotificationDropdown = app.views.Base.extend({
this.perPage = 5;
this.hasMoreNotifs = true;
this.badge = this.$el;
- this.dropdown = $('#notification_dropdown');
- this.dropdownNotifications = this.dropdown.find('.notifications');
- this.ajaxLoader = this.dropdown.find('.ajax_loader');
+ this.dropdown = $("#notification-dropdown");
+ this.dropdownNotifications = this.dropdown.find(".notifications");
+ this.ajaxLoader = this.dropdown.find(".ajax-loader");
this.perfectScrollbarInitialized = false;
},
toggleDropdown: function(evt){
- evt.preventDefault();
evt.stopPropagation();
+ if (!$("#notifications-link .entypo-bell:visible").length) { return true; }
+ evt.preventDefault();
if(this.dropdownShowing()){ this.hideDropdown(evt); }
else{ this.showDropdown(); }
},
dropdownShowing: function(){
- return this.dropdown.css('display') === 'block';
+ return this.dropdown.hasClass("dropdown-open");
},
showDropdown: function(){
this.resetParams();
this.ajaxLoader.show();
- this.badge.addClass('active');
- this.dropdown.css('display', 'block');
- this.dropdownNotifications.addClass('loading');
+ this.dropdown.addClass("dropdown-open");
+ this.updateScrollbar();
+ this.dropdownNotifications.addClass("loading");
this.getNotifications();
},
hideDropdown: function(evt){
- var inDropdown = $(evt.target).parents().is(this.dropdown);
+ var inDropdown = $(evt.target).parents().is($(".dropdown-menu", this.dropdown));
var inHovercard = $.contains(app.hovercard.el, evt.target);
if(!inDropdown && !inHovercard && this.dropdownShowing()){
- this.badge.removeClass('active');
- this.dropdown.css('display', 'none');
- if(this.perfectScrollbarInitialized) {
- this.dropdownNotifications.perfectScrollbar("destroy");
- this.perfectScrollbarInitialized = false;
- }
+ this.dropdown.removeClass("dropdown-open");
+ this.destroyScrollbar();
}
},
dropdownScroll: function(){
- var isLoading = ($('.loading').length === 1);
+ var isLoading = ($(".loading").length === 1);
if (this.isBottom() && this.hasMoreNotifs && !isLoading){
- this.dropdownNotifications.addClass('loading');
+ this.dropdownNotifications.addClass("loading");
this.getNotifications();
}
},
@@ -71,7 +68,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
},
isBottom: function(){
- var bottom = this.dropdownNotifications.prop('scrollHeight') - this.dropdownNotifications.height();
+ var bottom = this.dropdownNotifications.prop("scrollHeight") - this.dropdownNotifications.height();
var currentPosition = this.dropdownNotifications.scrollTop();
return currentPosition + 50 >= bottom;
},
@@ -89,21 +86,21 @@ app.views.NotificationDropdown = app.views.Base.extend({
hideAjaxLoader: function(){
var self = this;
- this.ajaxLoader.find('img').fadeTo(200, 0, function(){
- self.ajaxLoader.hide(300, function(){
- self.ajaxLoader.find('img').css('opacity', 1);
+ this.ajaxLoader.find(".spinner").fadeTo(200, 0, function(){
+ self.ajaxLoader.hide(200, function(){
+ self.ajaxLoader.find(".spinner").css("opacity", 1);
});
});
},
renderNotifications: function(){
var self = this;
- this.dropdownNotifications.find('.media.stream_element').remove();
+ this.dropdownNotifications.find(".media.stream_element").remove();
$.each(self.notifications, function(index, notifications){
$.each(notifications, function(index, notification){
if($.inArray(notification, notifications) === -1){
var node = self.dropdownNotifications.append(notification.note_html);
- $(node).find('.unread-toggle .entypo').tooltip('destroy').tooltip();
+ $(node).find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip();
$(node).find(self.avatars.selector).error(self.avatars.fallback);
}
});
@@ -113,15 +110,27 @@ app.views.NotificationDropdown = app.views.Base.extend({
app.helpers.timeago(this.dropdownNotifications);
- if(this.perfectScrollbarInitialized) {
- this.dropdownNotifications.perfectScrollbar("destroy");
- }
- this.dropdownNotifications.perfectScrollbar();
- this.perfectScrollbarInitialized = true;
+ this.updateScrollbar();
this.dropdownNotifications.removeClass("loading");
this.dropdownNotifications.scroll(function(){
self.dropdownScroll();
});
+ },
+
+ updateScrollbar: function() {
+ if(this.perfectScrollbarInitialized) {
+ this.dropdownNotifications.perfectScrollbar("update");
+ } else {
+ this.dropdownNotifications.perfectScrollbar();
+ this.perfectScrollbarInitialized = true;
+ }
+ },
+
+ destroyScrollbar: function() {
+ if(this.perfectScrollbarInitialized) {
+ this.dropdownNotifications.perfectScrollbar("destroy");
+ this.perfectScrollbarInitialized = false;
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/notifications_view.js b/app/assets/javascripts/app/views/notifications_view.js
index 808ce6749..3af3e717d 100644
--- a/app/assets/javascripts/app/views/notifications_view.js
+++ b/app/assets/javascripts/app/views/notifications_view.js
@@ -8,19 +8,19 @@ app.views.Notifications = Backbone.View.extend({
},
initialize: function() {
- $(".unread-toggle .entypo").tooltip();
+ $(".unread-toggle .entypo-eye").tooltip();
app.helpers.timeago($(document));
},
toggleUnread: function(evt) {
var note = $(evt.target).closest(".stream_element");
var unread = note.hasClass("unread");
-
- if (unread){ this.setRead(note.data("guid")); }
- else { this.setUnread(note.data("guid")); }
+ var guid = note.data("guid");
+ if (unread){ this.setRead(guid); }
+ else { this.setUnread(guid); }
},
- getAllUnread: function(){ return $('.media.stream_element.unread'); },
+ getAllUnread: function(){ return $(".media.stream_element.unread"); },
setRead: function(guid) { this.setUnreadStatus(guid, false); },
@@ -37,8 +37,9 @@ app.views.Notifications = Backbone.View.extend({
},
clickSuccess: function(data) {
- var type = $('.stream_element[data-guid=' + data["guid"] + ']').data('type');
- this.updateView(data["guid"], type, data["unread"]);
+ var guid = data.guid;
+ var type = $(".stream_element[data-guid=" + guid + "]").data("type");
+ this.updateView(guid, type, data.unread);
},
markAllRead: function(evt){
@@ -51,43 +52,44 @@ app.views.Notifications = Backbone.View.extend({
updateView: function(guid, type, unread) {
var change = unread ? 1 : -1,
- all_notes = $('ul.nav > li:eq(0) .badge'),
- type_notes = $('ul.nav > li[data-type=' + type + '] .badge'),
- header_badge = $('#notification_badge .badge_count'),
- note = $('.stream_element[data-guid=' + guid + ']'),
- markAllReadLink = $('a#mark_all_read_link'),
- translationKey = unread ? 'notifications.mark_read' : 'notifications.mark_unread';
+ allNotes = $("#notifications_container .list-group > a:eq(0) .badge"),
+ typeNotes = $("#notifications_container .list-group > a[data-type=" + type + "] .badge"),
+ headerBadge = $(".notifications-link .badge"),
+ note = $(".notifications .stream_element[data-guid=" + guid + "]"),
+ markAllReadLink = $("a#mark_all_read_link"),
+ translationKey = unread ? "notifications.mark_read" : "notifications.mark_unread";
if(unread){ note.removeClass("read").addClass("unread"); }
else { note.removeClass("unread").addClass("read"); }
- $(".unread-toggle .entypo", note)
- .tooltip('destroy')
+ $(".unread-toggle .entypo-eye", note)
+ .tooltip("destroy")
.removeAttr("data-original-title")
- .attr('title',Diaspora.I18n.t(translationKey))
+ .attr("title",Diaspora.I18n.t(translationKey))
.tooltip();
- [all_notes, type_notes, header_badge].forEach(function(element){
+ [allNotes, typeNotes, headerBadge].forEach(function(element){
element.text(function(i, text){
- return parseInt(text) + change });
+ return parseInt(text) + change;
+ });
});
- [all_notes, type_notes].forEach(function(badge) {
+ [allNotes, typeNotes].forEach(function(badge) {
if(badge.text() > 0) {
- badge.addClass('badge-important').removeClass('badge-default');
+ badge.removeClass("hidden");
}
else {
- badge.removeClass('badge-important').addClass('badge-default');
+ badge.addClass("hidden");
}
});
- if(header_badge.text() > 0){
- header_badge.removeClass('hidden');
- markAllReadLink.removeClass('disabled');
+ if(headerBadge.text() > 0){
+ headerBadge.removeClass("hidden");
+ markAllReadLink.removeClass("disabled");
}
else{
- header_badge.addClass('hidden');
- markAllReadLink.addClass('disabled');
+ headerBadge.addClass("hidden");
+ markAllReadLink.addClass("disabled");
}
}
});
diff --git a/app/assets/javascripts/app/views/photo_view.js b/app/assets/javascripts/app/views/photo_view.js
index 286d3fe98..ecf30fe1c 100644
--- a/app/assets/javascripts/app/views/photo_view.js
+++ b/app/assets/javascripts/app/views/photo_view.js
@@ -4,7 +4,7 @@ app.views.Photo = app.views.Base.extend({
templateName: "photo",
- className : "photo loaded",
+ className : "photo loaded col-md-4 col-sm-6 clearfix",
events: {
"click .remove_post": "destroyModel"
@@ -19,7 +19,7 @@ app.views.Photo = app.views.Base.extend({
presenter : function() {
return _.extend(this.defaultPresenter(), {
- authorIsCurrentUser : app.currentUser.isAuthorOf(this.model),
+ authorIsCurrentUser : app.currentUser.isAuthorOf(this.model)
});
}
});
diff --git a/app/assets/javascripts/app/views/photo_viewer.js b/app/assets/javascripts/app/views/photo_viewer.js
deleted file mode 100644
index d9a587400..000000000
--- a/app/assets/javascripts/app/views/photo_viewer.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-app.views.PhotoViewer = app.views.Base.extend({
- templateName : "photo-viewer",
-
- presenter : function(){
- return { photos : this.model.get("photos") }; //json array of attributes, not backbone models, yet.
- }
-});
-// @license-end
diff --git a/app/assets/javascripts/app/views/photos_view.js b/app/assets/javascripts/app/views/photos_view.js
index 5d5969ef1..8a31fc815 100644
--- a/app/assets/javascripts/app/views/photos_view.js
+++ b/app/assets/javascripts/app/views/photos_view.js
@@ -1,26 +1,24 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.Photos = app.views.InfScroll.extend({
+ className: "clearfix row",
+
+ postClass : app.views.Photo,
+
initialize : function() {
this.stream = this.model;
this.collection = this.stream.items;
// viable for extraction
this.stream.fetch();
-
- this.setupLightbox();
this.setupInfiniteScroll();
},
- postClass : app.views.Photo,
-
- setupLightbox : function(){
- this.lightbox = Diaspora.BaseWidget.instantiate("Lightbox");
- this.lightbox.set({
- imageParent: '#main_stream',
- imageSelector: 'img.photo'
- });
- $(this.el).delegate("a.photo-link", "click", this.lightbox.lightboxImageClicked);
+ postRenderTemplate: function(){
+ var photoAttachments = $("#main_stream > div");
+ if(photoAttachments.length > 0) {
+ new app.views.Gallery({ el: photoAttachments });
+ }
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/pod_entry_view.js b/app/assets/javascripts/app/views/pod_entry_view.js
new file mode 100644
index 000000000..112b6708f
--- /dev/null
+++ b/app/assets/javascripts/app/views/pod_entry_view.js
@@ -0,0 +1,84 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.views.PodEntry = app.views.Base.extend({
+ templateName: "pod_table_entry",
+
+ tagName: "tr",
+
+ events: {
+ "click .more": "toggleMore",
+ "click .recheck": "recheckPod"
+ },
+
+ tooltipSelector: ".ssl-status i, .actions i",
+
+ className: function() {
+ if( this.model.get("offline") ) { return "bg-danger"; }
+ if( this.model.get("status")==="version_failed" ) { return "bg-warning"; }
+ if( this.model.get("status")==="no_errors" ) { return "bg-success"; }
+ },
+
+ initialize: function(opts) {
+ this.parent = opts.parent;
+ this.rendered = false;
+ this.model.on("change", this.render, this);
+ },
+
+ presenter: function() {
+ return _.extend({}, this.defaultPresenter(), {
+ /* jshint camelcase: false */
+ is_unchecked: (this.model.get("status")==="unchecked"),
+ has_no_errors: (this.model.get("status")==="no_errors"),
+ has_errors: (this.model.get("status")!=="no_errors"),
+ status_text: Diaspora.I18n.t("admin.pods.states."+this.model.get("status")),
+ pod_url: (this.model.get("ssl") ? "https" : "http") + "://" + this.model.get("host") +
+ (this.model.get("port") ? ":" + this.model.get("port") : ""),
+ response_time_fmt: this._fmtResponseTime()
+ /* jshint camelcase: true */
+ });
+ },
+
+ postRenderTemplate: function() {
+ if( !this.rendered ) {
+ this.parent.appendChild(this.el);
+ }
+
+ this.rendered = true;
+ return this;
+ },
+
+ toggleMore: function() {
+ this.$(".details").toggle();
+ return false;
+ },
+
+ recheckPod: function() {
+ var self = this;
+ this.$el.addClass("checking");
+
+ this.model.recheck()
+ .done(function(){
+ app.flashMessages.success(Diaspora.I18n.t("admin.pods.recheck.success"));
+ })
+ .fail(function(){
+ app.flashMessages.error(Diaspora.I18n.t("admin.pods.recheck.failure"));
+ })
+ .always(function(){
+ self.$el
+ .removeClass("bg-danger bg-warning bg-success")
+ .addClass(_.result(self, "className"))
+ .removeClass("checking");
+ });
+
+ return false;
+ },
+
+ _fmtResponseTime: function() {
+ if( this.model.get("response_time")===-1 ) {
+ return Diaspora.I18n.t("admin.pods.not_available");
+ }
+ return Diaspora.I18n.t("admin.pods.ms", {count: this.model.get("response_time")});
+ }
+});
+
+// @license-end
diff --git a/app/assets/javascripts/app/views/poll_view.js b/app/assets/javascripts/app/views/poll_view.js
index 14355716d..751e47538 100644
--- a/app/assets/javascripts/app/views/poll_view.js
+++ b/app/assets/javascripts/app/views/poll_view.js
@@ -89,8 +89,8 @@ app.views.Poll = app.views.Base.extend({
},
toggleElements: function() {
- this.$('.percentage').toggle();
- this.$('.progress').toggle();
+ this.$(".poll-result").toggle();
+ this.$(".progress").toggle();
},
clickSubmit: function(evt) {
@@ -117,4 +117,3 @@ app.views.Poll = app.views.Base.extend({
});
// @license-end
-
diff --git a/app/assets/javascripts/app/views/preview_post_view.js b/app/assets/javascripts/app/views/preview_post_view.js
new file mode 100644
index 000000000..1f8fe3981
--- /dev/null
+++ b/app/assets/javascripts/app/views/preview_post_view.js
@@ -0,0 +1,41 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.views.PreviewPost = app.views.Post.extend({
+ templateName: "stream-element",
+ className: "stream_element loaded",
+
+ subviews: {
+ ".feedback": "feedbackView",
+ ".post-content": "postContentView",
+ ".oembed": "oEmbedView",
+ ".opengraph": "openGraphView",
+ ".poll": "pollView",
+ ".status-message-location": "postLocationStreamView"
+ },
+
+ tooltipSelector: [
+ ".timeago",
+ ".delete",
+ ".permalink"
+ ].join(", "),
+
+ initialize: function() {
+ this.model.set("preview", true);
+ this.oEmbedView = new app.views.OEmbed({model: this.model});
+ this.openGraphView = new app.views.OpenGraph({model: this.model});
+ this.pollView = new app.views.Poll({model: this.model});
+ },
+
+ feedbackView: function() {
+ return new app.views.Feedback({model: this.model});
+ },
+
+ postContentView: function() {
+ return new app.views.StatusMessage({model: this.model});
+ },
+
+ postLocationStreamView: function() {
+ return new app.views.LocationStream({model: this.model});
+ }
+});
+// @license-end
diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js
index c9e4bc655..906736895 100644
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -3,10 +3,20 @@
app.views.ProfileHeader = app.views.Base.extend({
templateName: 'profile_header',
+ subviews: {
+ ".aspect_membership_dropdown": "aspectMembershipView"
+ },
+
+ events: {
+ "click #mention_button": "showMentionModal",
+ "click #message_button": "showMessageModal"
+ },
+
initialize: function(opts) {
- app.events.on('aspect:create', this.postRenderTemplate, this);
this.photos = _.has(opts, 'photos') ? opts.photos : null;
this.contacts = _.has(opts, 'contacts') ? opts.contacts : null;
+ $("#mentionModal").on("modal:loaded", this.mentionModalLoaded.bind(this));
+ $("#mentionModal").on("hidden.bs.modal", this.mentionModalHidden);
},
presenter: function() {
@@ -24,6 +34,10 @@ app.views.ProfileHeader = app.views.Base.extend({
});
},
+ aspectMembershipView: function() {
+ return new app.views.AspectMembership({person: this.model, dropdownMayCreateNewAspect: true});
+ },
+
_hasTags: function() {
return (this.model.get('profile')['tags'].length > 0);
},
@@ -33,30 +47,40 @@ app.views.ProfileHeader = app.views.Base.extend({
},
_shouldShowPhotos: function() {
- return (this.photos && this.photos.count > 0);
+ return (this.photos && this.photos > 0);
},
_shouldShowContacts: function() {
- return (this.contacts && this.contacts.count > 0);
+ return (this.contacts && this.contacts > 0);
},
- postRenderTemplate: function() {
- var dropdownEl = this.$('.aspect_membership_dropdown.placeholder');
- if( dropdownEl.length === 0 ) {
- return;
- }
+ showMentionModal: function() {
+ app.helpers.showModal("#mentionModal");
+ },
- // TODO render me client side!!!
- var href = this.model.url() + '/aspect_membership_button?create=true&size=normal';
-
- $.get(href, function(resp) {
- dropdownEl.html(resp);
- new app.views.AspectMembership({el: $('.aspect_dropdown',dropdownEl)});
-
- // UGLY (re-)attach the facebox
- self.$('a[rel*=facebox]').facebox();
+ mentionModalLoaded: function() {
+ app.publisher = new app.views.Publisher({
+ standalone: true,
+ prefillMention: _.extend({handle: this.model.get("diaspora_id")}, this.model.attributes)
});
- }
+ app.publisher.open();
+ $("#publisher").bind("ajax:success", function() {
+ $("#mentionModal").modal("hide");
+ app.publisher.clear();
+ app.publisher.remove();
+ location.reload();
+ });
+ },
+
+ mentionModalHidden: function() {
+ app.publisher.clear();
+ app.publisher.remove();
+ $("#mentionModal .modal-body").empty();
+ },
+
+ showMessageModal: function(){
+ app.helpers.showModal("#conversationModal");
+ },
});
// @license-end
diff --git a/app/assets/javascripts/app/views/profile_sidebar_view.js b/app/assets/javascripts/app/views/profile_sidebar_view.js
index a8b0d4074..f19f7970a 100644
--- a/app/assets/javascripts/app/views/profile_sidebar_view.js
+++ b/app/assets/javascripts/app/views/profile_sidebar_view.js
@@ -1,17 +1,7 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.ProfileSidebar = app.views.Base.extend({
- templateName: 'profile_sidebar',
-
- presenter: function() {
- return _.extend({}, this.defaultPresenter(), {
- show_profile_info: this._shouldShowProfileInfo(),
- });
- },
-
- _shouldShowProfileInfo: function() {
- return (this.model.isSharing() || this.model.get('is_own_profile'));
- }
+ templateName: "profile_sidebar"
});
// @license-end
diff --git a/app/assets/javascripts/app/views/publisher/aspect_selector_view.js b/app/assets/javascripts/app/views/publisher/aspect_selector_view.js
index 7145de4ad..5e65e63ec 100644
--- a/app/assets/javascripts/app/views/publisher/aspect_selector_view.js
+++ b/app/assets/javascripts/app/views/publisher/aspect_selector_view.js
@@ -32,15 +32,15 @@ app.views.PublisherAspectSelector = app.views.AspectsDropdown.extend({
this._updateSelectedAspectIds();
this._updateButton('btn-default');
-
+
// update the globe or lock icon
- var icon = this.$('#visibility-icon');
- if (target.find('.text').text().trim() === Diaspora.I18n.t('stream.public')) {
- icon.removeClass('lock');
- icon.addClass('globe');
+ var icon = this.$("#visibility-icon");
+ if (target.find(".text").text().trim() === Diaspora.I18n.t("stream.public")) {
+ icon.removeClass("entypo-lock");
+ icon.addClass("entypo-globe");
} else {
- icon.removeClass('globe');
- icon.addClass('lock');
+ icon.removeClass("entypo-globe");
+ icon.addClass("entypo-lock");
}
},
diff --git a/app/assets/javascripts/app/views/publisher/getting_started_view.js b/app/assets/javascripts/app/views/publisher/getting_started_view.js
index 6d36a83a7..5ba089efc 100644
--- a/app/assets/javascripts/app/views/publisher/getting_started_view.js
+++ b/app/assets/javascripts/app/views/publisher/getting_started_view.js
@@ -11,70 +11,67 @@
app.views.PublisherGettingStarted = Backbone.View.extend({
initialize: function(opts) {
- this.el_first_msg = opts.el_first_msg;
- this.el_visibility = opts.el_visibility;
- this.el_stream = opts.el_stream;
+ this.firstMessage = opts.firstMessageEl;
+ this.visibility = opts.visibilityEl;
+ this.stream = opts.streamEl;
},
// initiate all the popover message boxes
show: function() {
- this._addPopover(this.el_first_msg, {
- trigger: 'manual',
- offset: 30,
- id: 'first_message_explain',
- placement: 'right',
+ app.publisher.open();
+ this._addPopover(this.firstMessage, {
+ trigger: "manual",
+ id: "first_message_explain",
+ placement: "left",
html: true,
- container: 'body'
+ container: "body"
}, 600);
- this._addPopover(this.el_visibility, {
- trigger: 'manual',
- offset: 10,
- id: 'message_visibility_explain',
- placement: 'bottom',
+ this._addPopover(this.visibility, {
+ trigger: "manual",
+ id: "message_visibility_explain",
+ placement: "bottom",
html: true,
- container: 'body'
+ container: "body"
}, 1000);
- this._addPopover(this.el_stream, {
- trigger: 'manual',
- offset: -5,
- id: 'stream_explain',
- placement: 'left',
+ this._addPopover(this.stream, {
+ trigger: "manual",
+ id: "stream_explain",
+ placement: "left",
html: true,
- container: 'body'
+ container: "body"
}, 1400);
// hide some popovers when a post is created
- this.$('.button.creation').click(function() {
- this.el_visibility.popover('hide');
- this.el_first_msg.popover('hide');
+ this.$("#submit").click(function() {
+ this.visibility.popover("hide");
+ this.firstMessage.popover("hide");
});
},
_addPopover: function(el, opts, timeout) {
el.popover(opts);
el.click(function() {
- el.popover('hide');
+ el.popover("hide");
});
// show the popover after the given timeout
setTimeout(function() {
- el.popover('show');
+ el.popover("show");
// disable 'getting started' when the last popover is closed
- var popup = el.data('popover').$tip[0];
- var close = $(popup).find('.close');
+ var popup = el.data("bs.popover").$tip[0];
+ var close = $(popup).find(".close");
close.click(function() {
- if( $('.popover').length === 1 ) {
- $.get('/getting_started_completed', {success: function() {
+ if( $(".popover").length <= 1 ) {
+ $.get("/getting_started_completed", {success: function() {
$("#welcome-to-diaspora, #welcome-to-diaspora~br").remove();
}});
}
- el.popover('hide');
+ el.popover("hide");
return false;
});
}, timeout);
}
});
// @license-end
-
diff --git a/app/assets/javascripts/app/views/publisher/mention_view.js b/app/assets/javascripts/app/views/publisher/mention_view.js
new file mode 100644
index 000000000..b8f6143f5
--- /dev/null
+++ b/app/assets/javascripts/app/views/publisher/mention_view.js
@@ -0,0 +1,223 @@
+//= require ../search_base_view
+
+app.views.PublisherMention = app.views.SearchBase.extend({
+ triggerChar: "@",
+ invisibleChar: "\u200B", // zero width space
+ mentionRegex: /@([^@\s]+)$/,
+
+ templates: {
+ mentionItemSyntax: _.template("@{<%= name %> ; <%= handle %>}"),
+ mentionItemHighlight: _.template("<%= name %>")
+ },
+
+ events: {
+ "keydown #status_message_fake_text": "onInputBoxKeyDown",
+ "input #status_message_fake_text": "onInputBoxInput",
+ "click #status_message_fake_text": "onInputBoxClick",
+ "blur #status_message_fake_text": "onInputBoxBlur",
+ },
+
+ initialize: function() {
+ this.mentionedPeople = [];
+
+ // contains the 'fake text' displayed to the user
+ // also has a data-messageText attribute with the original text
+ this.inputBox = this.$("#status_message_fake_text");
+ // contains the mentions displayed to the user
+ this.mentionsBox = this.$(".mentions-box");
+ this.typeaheadInput = this.$(".typeahead-mention-box");
+ this.bindTypeaheadEvents();
+
+ app.views.SearchBase.prototype.initialize.call(this, {
+ typeaheadInput: this.typeaheadInput,
+ customSearch: true,
+ autoselect: true,
+ remoteRoute: "/contacts"
+ });
+ },
+
+ bindTypeaheadEvents: function() {
+ var self = this;
+ // Process mention when the user selects a result.
+ this.typeaheadInput.on("typeahead:select", function(evt, person) { self.onSuggestionSelection(person); });
+ },
+
+ addPersonToMentions: function(person) {
+ if(!(person && person.name && person.handle)) { return; }
+ // This is needed for processing preview
+ /* jshint camelcase: false */
+ person.diaspora_id = person.handle;
+ /* jshint camelcase: true */
+ this.mentionedPeople.push(person);
+ this.ignorePersonForSuggestions(person);
+ },
+
+ cleanMentionedPeople: function() {
+ var inputText = this.inputBox.val();
+ this.mentionedPeople = this.mentionedPeople.filter(function(person) {
+ return person.name && inputText.indexOf(person.name) > -1;
+ });
+ this.ignoreDiasporaIds = this.mentionedPeople.map(function(person) { return person.handle; });
+ },
+
+ onSuggestionSelection: function(person) {
+ var messageText = this.inputBox.val();
+ var caretPosition = this.inputBox[0].selectionStart;
+ var triggerCharPosition = messageText.lastIndexOf(this.triggerChar, caretPosition);
+
+ if(triggerCharPosition === -1) { return; }
+
+ this.addPersonToMentions(person);
+ this.closeSuggestions();
+
+ messageText = messageText.substring(0, triggerCharPosition) +
+ this.invisibleChar + person.name + messageText.substring(caretPosition);
+
+ this.inputBox.val(messageText);
+ this.updateMessageTexts();
+
+ this.inputBox.focus();
+ var newCaretPosition = triggerCharPosition + person.name.length + 1;
+ this.inputBox[0].setSelectionRange(newCaretPosition, newCaretPosition);
+ },
+
+ /**
+ * Replaces every combination of this.invisibleChar + mention.name by the
+ * correct syntax for both hidden text and visible one.
+ *
+ * For instance, the text "Hello \u200Buser1" will be tranformed to
+ * "Hello @{user1 ; user1@pod.tld}" in the hidden element and
+ * "Hello user1" in the element visible to the user.
+ */
+ updateMessageTexts: function() {
+ var fakeMessageText = this.inputBox.val(),
+ mentionBoxText = _.escape(fakeMessageText),
+ messageText = fakeMessageText;
+
+ this.mentionedPeople.forEach(function(person) {
+ var mentionName = this.invisibleChar + person.name;
+ messageText = messageText.replace(mentionName, this.templates.mentionItemSyntax(person));
+ var textHighlight = this.templates.mentionItemHighlight({name: _.escape(person.name)});
+ mentionBoxText = mentionBoxText.replace(mentionName, textHighlight);
+ }, this);
+
+ this.inputBox.data("messageText", messageText);
+ this.mentionsBox.find(".mentions").html(mentionBoxText);
+ },
+
+ updateTypeaheadInput: function() {
+ var messageText = this.inputBox.val();
+ var caretPosition = this.inputBox[0].selectionStart;
+ var result = this.mentionRegex.exec(messageText.substring(0,caretPosition));
+
+ if(result === null) {
+ this.closeSuggestions();
+ return;
+ }
+
+ // result[1] is the string between the last '@' and the current caret position
+ this.typeaheadInput.typeahead("val", result[1]);
+ this.typeaheadInput.typeahead("open");
+ },
+
+ /**
+ * Let us prefill the publisher with a mention list
+ * @param persons List of people to mention in a post;
+ * JSON object of form { handle:
' +
- '
'+
- '" +
+ " "+
+ "
" +
+ " "+
+ "' +
- Diaspora.I18n.t('photo_uploader.error', {file: fileName}) +
- '
'
+ this.trigger("change");
+ this.info.text(Diaspora.I18n.t("photo_uploader.error", {file: fileName}));
+ this.publisher.wrapperEl.find("#photodropzone_container").first().after(
+ "" +
+ Diaspora.I18n.t("photo_uploader.error", {file: fileName}) +
+ "
"
);
}
},
@@ -93,58 +95,58 @@ app.views.PublisherUploader = Backbone.View.extend({
var publisher = this.publisher;
// add form input element
- publisher.$('.content_creation form').append(
- ''
+ publisher.$(".content_creation form").append(
+ ""
);
// replace placeholder
- var placeholder = publisher.el_photozone.find('li.loading').first();
+ var placeholder = publisher.photozoneEl.find("li.loading").first();
placeholder
- .removeClass('loading')
+ .removeClass("loading")
.prepend(
- ''+
- ''
+ ""+
+ ""
)
- .find('img').attr({'src': url, 'data-id': id}).removeClass('ajax-loader');
+ .find("img").attr({"src": url, "data-id": id}).removeClass("ajax-loader");
placeholder
- .find('div.progress').remove();
+ .find("div.progress").remove();
// no more placeholders? enable buttons
- if( publisher.el_photozone.find('li.loading').length === 0 ) {
- this.$el.removeClass('loading');
+ if( publisher.photozoneEl.find("li.loading").length === 0 ) {
+ this.$el.removeClass("loading");
publisher.setButtonsEnabled(true);
}
},
_cancelPhotoUpload: function() {
var publisher = this.publisher;
- var placeholder = publisher.el_photozone.find('li.loading').first();
+ var placeholder = publisher.photozoneEl.find("li.loading").first();
placeholder
- .removeClass('loading')
- .find('img').remove();
+ .removeClass("loading")
+ .find("img").remove();
},
// remove an already uploaded photo
_removePhoto: function(evt) {
var self = this;
- var photo = $(evt.target).parents('.publisher_photo');
- var img = photo.find('img');
+ var photo = $(evt.target).parents(".publisher_photo");
+ var img = photo.find("img");
- photo.addClass('dim');
+ photo.addClass("dim");
$.ajax({
- url: '/photos/'+img.attr('data-id'),
- dataType: 'json',
- type: 'DELETE',
+ url: "/photos/"+img.attr("data-id"),
+ dataType: "json",
+ type: "DELETE",
success: function() {
$.when(photo.fadeOut(400)).then(function(){
photo.remove();
- if( self.publisher.$('.publisher_photo').length === 0 ) {
+ if( self.publisher.$(".publisher_photo").length === 0 ) {
// no more photos left...
- self.publisher.el_wrapper.removeClass('with_attachments');
+ self.publisher.wrapperEl.removeClass("with_attachments");
}
- self.trigger('change');
+ self.trigger("change");
});
}
});
diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js
index fece5dd08..95aab180a 100644
--- a/app/assets/javascripts/app/views/publisher_view.js
+++ b/app/assets/javascripts/app/views/publisher_view.js
@@ -5,9 +5,11 @@
* the COPYRIGHT file.
*/
-//= require ./publisher/services_view
//= require ./publisher/aspect_selector_view
//= require ./publisher/getting_started_view
+//= require ./publisher/mention_view
+//= require ./publisher/poll_creator_view
+//= require ./publisher/services_view
//= require ./publisher/uploader_view
//= require jquery-textchange
@@ -18,10 +20,8 @@ app.views.Publisher = Backbone.View.extend({
events : {
"keydown #status_message_fake_text" : "keyDown",
"focus textarea" : "open",
- "click #hide_publisher" : "clear",
"submit form" : "createStatusMessage",
"click #submit" : "createStatusMessage",
- "click .post_preview_button" : "createPostPreview",
"textchange #status_message_fake_text": "handleTextchange",
"click #locator" : "showLocation",
"click #poll_creator" : "togglePollCreator",
@@ -31,70 +31,62 @@ app.views.Publisher = Backbone.View.extend({
initialize : function(opts){
this.standalone = opts ? opts.standalone : false;
+ this.prefillMention = opts && opts.prefillMention ? opts.prefillMention : undefined;
this.disabled = false;
// init shortcut references to the various elements
- this.el_input = this.$('#status_message_fake_text');
- this.el_hiddenInput = this.$('#status_message_text');
- this.el_wrapper = this.$('#publisher_textarea_wrapper');
- this.el_submit = this.$('input[type=submit], button#submit');
- this.el_preview = this.$('button.post_preview_button');
- this.el_photozone = this.$('#photodropzone');
-
- // init mentions plugin
- Mentions.initialize(this.el_input);
-
- // init autoresize plugin
- this.el_input.autoResize({ 'extraSpace' : 10, 'maxHeight' : Infinity });
+ this.inputEl = this.$("#status_message_fake_text");
+ this.hiddenInputEl = this.$("#status_message_text");
+ this.wrapperEl = this.$("#publisher_textarea_wrapper");
+ this.submitEl = this.$("input[type=submit], button#submit");
+ this.photozoneEl = this.$("#photodropzone");
// if there is data in the publisher we ask for a confirmation
// before the user is able to leave the page
- $(window).on('beforeunload', _.bind(this._beforeUnload, this));
+ $(window).on("beforeunload", _.bind(this._beforeUnload, this));
+ $(window).unload(this.clear.bind(this));
// sync textarea content
- if( this.el_hiddenInput.val() === "" ) {
- this.el_hiddenInput.val( this.el_input.val() );
+ if( this.hiddenInputEl.val() === "" ) {
+ this.hiddenInputEl.val( this.inputEl.val() );
}
- if( this.el_input.val() === "" ) {
- this.el_input.val( this.el_hiddenInput.val() );
+ if( this.inputEl.val() === "" ) {
+ this.inputEl.val( this.hiddenInputEl.val() );
}
// hide close and preview buttons and manage services link
// in case publisher is standalone
// (e.g. bookmarklet, mentions popup)
if( this.standalone ) {
- this.$("#hide_publisher").hide();
- this.el_preview.hide();
this.$(".question_mark").hide();
}
// this has to be here, otherwise for some reason the callback for the
// textchange event won't be called in Backbone...
- this.el_input.bind('textchange', $.noop);
+ this.inputEl.bind("textchange", $.noop);
- var _this = this;
- $('body').on('click', function(event){
- // if the click event is happened outside the publisher view, then try to close the box
- if( _this.el && $(event.target).closest('#publisher').attr('id') !== _this.el.id){
- _this.tryClose();
- }
- });
+ $("body").click(function(event) {
+ var $target = $(event.target);
+ if ($target.closest("#publisher").length === 0 && !$target.hasClass("dropdown-backdrop")) {
+ this.tryClose();
+ }
+ }.bind(this));
// close publisher on post
- this.on('publisher:add', function() {
+ this.on("publisher:add", function() {
this.close();
this.showSpinner(true);
});
// open publisher on post error
- this.on('publisher:error', function() {
+ this.on("publisher:error", function() {
this.open();
this.showSpinner(false);
});
// resetting the poll view
- this.on('publisher:sync', function() {
- this.view_poll_creator.render();
+ this.on("publisher:sync", function() {
+ this.viewPollCreator.render();
});
this.initSubviews();
@@ -103,56 +95,96 @@ app.views.Publisher = Backbone.View.extend({
},
initSubviews: function() {
- var form = this.$('.content_creation form');
+ this.mention = new app.views.PublisherMention({ el: this.$("#publisher_textarea_wrapper") });
+ if(this.prefillMention) {
+ this.mention.prefillMention([this.prefillMention]);
+ }
+
+ var form = this.$(".content_creation form");
this.view_services = new app.views.PublisherServices({
- el: this.$('#publisher_service_icons'),
- input: this.el_input,
+ el: this.$("#publisher-service-icons"),
+ input: this.inputEl,
form: form
});
- this.view_aspect_selector = new app.views.PublisherAspectSelector({
- el: this.$('.public_toggle .aspect_dropdown'),
+ this.viewAspectSelector = new app.views.PublisherAspectSelector({
+ el: this.$(".public_toggle .aspect_dropdown"),
form: form
});
- this.view_getting_started = new app.views.PublisherGettingStarted({
- el_first_msg: this.el_input,
- el_visibility: this.$('.public_toggle .aspect_dropdown > .dropdown-toggle'),
- el_stream: $('#gs-shim')
+ this.viewGettingStarted = new app.views.PublisherGettingStarted({
+ firstMessageEl: this.inputEl,
+ visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),
+ streamEl: $("#main_stream")
});
- this.view_uploader = new app.views.PublisherUploader({
- el: this.$('#file-upload'),
+ this.viewUploader = new app.views.PublisherUploader({
+ el: this.$("#file-upload"),
publisher: this
});
- this.view_uploader.on('change', this.checkSubmitAvailability, this);
+ this.viewUploader.on("change", this.checkSubmitAvailability, this);
- this.view_poll_creator = new app.views.PublisherPollCreator({
- el: this.$('#poll_creator_container')
+ var self = this;
+ var mdEditorOptions = {
+ onPreview: function() {
+ self.wrapperEl.addClass("markdown-preview");
+ return self.createPostPreview();
+ },
+
+ onHidePreview: function() {
+ self.wrapperEl.removeClass("markdown-preview");
+ },
+
+ onPostPreview: function() {
+ var photoAttachments = self.wrapperEl.find(".photo_attachments");
+ if (photoAttachments.length > 0) {
+ new app.views.Gallery({el: photoAttachments});
+ }
+ },
+
+ onChange: function() {
+ self.inputEl.trigger("textchange");
+ }
+ };
+
+ if (!this.standalone) {
+ mdEditorOptions.onClose = function() {
+ self.clear();
+ };
+ }
+ this.markdownEditor = new Diaspora.MarkdownEditor(this.inputEl, mdEditorOptions);
+
+ this.viewPollCreator = new app.views.PublisherPollCreator({
+ el: this.$("#poll_creator_container")
});
- this.view_poll_creator.on('change', this.checkSubmitAvailability, this);
- this.view_poll_creator.render();
+ this.viewPollCreator.on("change", this.checkSubmitAvailability, this);
+ this.viewPollCreator.render();
+
+ if (this.prefillMention) {
+ this.handleTextchange();
+ }
},
// set the selected aspects in the dropdown by their ids
setSelectedAspects: function(ids) {
- this.view_aspect_selector.updateAspectsSelector(ids);
+ this.viewAspectSelector.updateAspectsSelector(ids);
},
// inject content into the publisher textarea
setText: function(txt) {
- this.el_input.val(txt);
- this.el_hiddenInput.val(txt);
+ this.inputEl.val(txt);
+ this.hiddenInputEl.val(txt);
this.prefillText = txt;
- this.el_input.trigger('input');
+ this.inputEl.trigger("input");
+ autosize.update(this.inputEl);
this.handleTextchange();
},
// show the "getting started" popups around the publisher
triggerGettingStarted: function() {
- this.view_getting_started.show();
+ this.viewGettingStarted.show();
},
createStatusMessage : function(evt) {
@@ -164,7 +196,7 @@ app.views.Publisher = Backbone.View.extend({
// Auto-adding a poll answer always leaves an empty box when the user starts
// typing in the last box. We'll delete the last one to avoid submitting an
// empty poll answer and failing validation.
- this.view_poll_creator.removeLastAnswer();
+ this.viewPollCreator.removeLastAnswer();
//add missing mentions at end of post:
this.handleTextchange();
@@ -172,10 +204,13 @@ app.views.Publisher = Backbone.View.extend({
var serializedForm = $(evt.target).closest("form").serializeObject();
// disable input while posting, must be after the form is serialized
this.setInputEnabled(false);
+ this.wrapperEl.addClass("submitting");
// lulz this code should be killed.
var statusMessage = new app.models.Post();
- if( app.publisher ) app.publisher.trigger('publisher:add');
+ if( app.publisher ) {
+ app.publisher.trigger("publisher:add");
+ }
statusMessage.save({
"status_message" : {
@@ -192,9 +227,9 @@ app.views.Publisher = Backbone.View.extend({
url : "/status_messages",
success : function() {
if( app.publisher ) {
- app.publisher.$el.trigger('ajax:success');
- app.publisher.trigger('publisher:sync');
- self.view_poll_creator.trigger('publisher:sync');
+ app.publisher.$el.trigger("ajax:success");
+ app.publisher.trigger("publisher:sync");
+ self.viewPollCreator.trigger("publisher:sync");
}
if(app.stream && !self.standalone){
@@ -208,20 +243,25 @@ app.views.Publisher = Backbone.View.extend({
if( self.standalone ) self.setEnabled(false);
},
error: function(model, resp) {
- if( app.publisher ) app.publisher.trigger('publisher:error');
+ if( app.publisher ) {
+ app.publisher.trigger("publisher:error");
+ }
self.setInputEnabled(true);
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':resp.responseText });
+ app.flashMessages.error(resp.responseText);
self.setButtonsEnabled(true);
self.setInputEnabled(true);
+ self.wrapperEl.removeClass("submitting");
+ self.handleTextchange();
+ autosize.update(self.inputEl);
}
});
},
// creates the location
showLocation: function(){
- if($('#location').length === 0){
- $('#location_container').append('');
- this.el_wrapper.addClass('with_location');
+ if($("#location").length === 0){
+ this.$(".location-container").append("");
+ this.wrapperEl.addClass("with-location");
this.view_locator = new app.views.Location();
}
},
@@ -230,36 +270,30 @@ app.views.Publisher = Backbone.View.extend({
destroyLocation: function(){
if(this.view_locator){
this.view_locator.remove();
- this.el_wrapper.removeClass('with_location');
+ this.wrapperEl.removeClass("with-location");
delete this.view_locator;
}
},
togglePollCreator: function(){
- this.view_poll_creator.$el.toggle();
- this.el_input.focus();
+ this.wrapperEl.toggleClass("with-poll");
+ this.inputEl.focus();
},
// avoid submitting form when pressing Enter key
avoidEnter: function(evt){
- if(evt.keyCode === 13)
+ if(evt.which === Keycodes.ENTER) {
return false;
+ }
},
- createPostPreview : function(evt) {
- if(evt){ evt.preventDefault(); }
-
- //add missing mentions at end of post:
- this.handleTextchange();
-
- var serializedForm = $(evt.target).closest("form").serializeObject();
-
+ getUploadedPhotos: function() {
var photos = [];
- $('li.publisher_photo img').each(function(){
- var file = $(this).attr('src').substring("/uploads/images/".length);
+ $("li.publisher_photo img").each(function() {
+ var file = $(this).attr("src").substring("/uploads/images/".length);
photos.push(
{
- "sizes":{
+ "sizes": {
"small" : "/uploads/images/thumb_small_" + file,
"medium" : "/uploads/images/thumb_medium_" + file,
"large" : "/uploads/images/scaled_full_" + file
@@ -267,94 +301,72 @@ app.views.Publisher = Backbone.View.extend({
}
);
});
+ return photos;
+ },
- var mentioned_people = [],
- regexp = new RegExp("@{\(\[\^\;\]\+\); \(\[\^\}\]\+\)}", "g"),
- user;
-
- var getMentionedUser = function(handle) {
- return Mentions.contacts.filter(function(user) {
- return user.handle === handle;
- })[0];
- };
-
- while( (user = regexp.exec(serializedForm["status_message[text]"])) ){
- // user[1]: name, user[2]: handle
- var mentioned_user = getMentionedUser(user[2]);
- if(mentioned_user){
- mentioned_people.push({
- "id":mentioned_user["id"],
- "guid":mentioned_user["guid"],
- "name":user[1],
- "diaspora_id":user[2],
- "avatar":mentioned_user["avatar"]
- });
- }
- }
-
- var date = (new Date()).toISOString();
-
+ getPollData: function(serializedForm) {
var poll;
- var poll_question = serializedForm["poll_question"];
- var poll_answers_arry = _.flatten([serializedForm["poll_answers[]"]]);
- var poll_answers = _.map(poll_answers_arry, function(answer){
- if(answer) return { 'answer' : answer };
+ var pollQuestion = serializedForm.poll_question;
+ var pollAnswersArray = _.flatten([serializedForm["poll_answers[]"]]);
+ var pollAnswers = _.map(pollAnswersArray, function(answer){
+ if (answer) {
+ return {"answer": answer, "vote_count": 0};
+ }
});
- poll_answers = _.without(poll_answers, undefined);
+ pollAnswers = _.without(pollAnswers, undefined);
- if(poll_question && poll_answers.length) {
+ if(pollQuestion && pollAnswers.length) {
poll = {
- 'question': poll_question,
- 'poll_answers' : poll_answers,
- 'participation_count': '0'
+ "question": pollQuestion,
+ "poll_answers": pollAnswers,
+ "participation_count": "0"
};
}
+ return poll;
+ },
+
+ createPostPreview: function() {
+ //add missing mentions at end of post:
+ this.handleTextchange();
+
+ var serializedForm = $("#new_status_message").serializeObject();
+ var text = this.mention.getTextForSubmit();
+ var photos = this.getUploadedPhotos();
+ var mentionedPeople = this.mention.mentionedPeople;
+ var poll = this.getPollData(serializedForm);
+ var locationCoords = serializedForm["location[coords]"];
+ if(!locationCoords || locationCoords === "") {
+ locationCoords = ["", ""];
+ } else {
+ locationCoords = locationCoords.split(",");
+ }
+ var location = {
+ "address": $("#location_address").val(),
+ "lat": locationCoords[0],
+ "lng": locationCoords[1]
+ };
var previewMessage = {
- "id" : 0,
- "text" : serializedForm["status_message[text]"],
- "public" : serializedForm["aspect_ids[]"] === "public",
- "created_at" : date,
- "interacted_at" : date,
- "post_type" : "StatusMessage",
- "author" : app.currentUser ? app.currentUser.attributes : {},
- "mentioned_people" : mentioned_people,
- "photos" : photos,
- "frame_name" : "status",
- "title" : serializedForm["status_message[text]"],
- "address" : $("#location_address").val(),
- "interactions" : {"likes":[],"reshares":[],"comments_count":0,"likes_count":0,"reshares_count":0},
- 'poll': poll,
+ "id": 0,
+ "text": text,
+ "public": serializedForm["aspect_ids[]"] === "public",
+ "created_at": new Date().toISOString(),
+ "interacted_at": new Date().toISOString(),
+ "author": app.currentUser ? app.currentUser.attributes : {},
+ "mentioned_people": mentionedPeople,
+ "photos": photos,
+ "title": serializedForm["status_message[text]"],
+ "location": location,
+ "interactions": {"likes": [], "reshares": [], "comments_count": 0, "likes_count": 0, "reshares_count": 0},
+ "poll": poll
};
- if(app.stream) {
- this.removePostPreview();
- app.stream.addNow(previewMessage);
- this.recentPreview=previewMessage;
- this.modifyPostPreview($('.stream_element:first',$('.stream_container')));
- }
- },
- modifyPostPreview : function(post) {
- post.addClass('post_preview');
- $('.collapsible',post).removeClass('collapsed').addClass('opened');
- $('a.delete.remove_post',post).hide();
- $('a.like, a.focus_comment_textarea',post).removeAttr("href");
- $('a.like',post).addClass("like_preview");
- $('a.like',post).removeClass("like");
- $('a.focus_comment_textarea',post).addClass("focus_comment_textarea_preview");
- $('a.focus_comment_textarea',post).removeClass("focus_comment_textarea");
- $('a',$('span.details.grey',post)).removeAttr("href");
- },
-
- removePostPreview : function() {
- if(app.stream && this.recentPreview){
- app.stream.items.remove(this.recentPreview);
- delete this.recentPreview;
- }
+ var previewPost = new app.views.PreviewPost({model: new app.models.Post(previewMessage)}).render().el;
+ return $("").append(previewPost).html();
},
keyDown : function(evt) {
- if( evt.keyCode === 13 && evt.ctrlKey ) {
+ if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
this.$("form").submit();
this.open();
return false;
@@ -362,29 +374,28 @@ app.views.Publisher = Backbone.View.extend({
},
clear : function() {
- // clear text(s)
- this.el_input.val('');
- this.el_hiddenInput.val('');
- this.el_input.trigger('keyup')
- .trigger('keydown');
-
// remove mentions
- this.el_input.mentionsInput('reset');
+ this.mention.reset();
+
+ // clear text(s)
+ this.inputEl.val("");
+ this.hiddenInputEl.val("");
+ this.inputEl.trigger("keyup")
+ .trigger("keydown");
+ autosize.update(this.inputEl);
// remove photos
- this.el_photozone.find('li').remove();
+ this.photozoneEl.find("li").remove();
this.$("input[name='photos[]']").remove();
- this.el_wrapper.removeClass("with_attachments");
+ this.wrapperEl.removeClass("with_attachments");
// empty upload-photo
- this.$('#fileInfo').empty();
+ this.$("#fileInfo").empty();
- // close publishing area (CSS)
+ // remove preview and close publishing area (CSS)
+ this.markdownEditor.hidePreview();
this.close();
- // remove preview
- this.removePostPreview();
-
// disable submitting
this.checkSubmitAvailability();
@@ -393,6 +404,7 @@ app.views.Publisher = Backbone.View.extend({
// enable input
this.setInputEnabled(true);
+ this.wrapperEl.removeClass("submitting");
// enable buttons
this.setButtonsEnabled(true);
@@ -401,11 +413,11 @@ app.views.Publisher = Backbone.View.extend({
this.destroyLocation();
// clear poll form
- this.view_poll_creator.clearInputs();
+ this.viewPollCreator.clearInputs();
// force textchange plugin to update lastValue
- this.el_input.data('lastValue', '');
- this.el_hiddenInput.data('lastValue', '');
+ this.inputEl.data("lastValue", "");
+ this.hiddenInputEl.data("lastValue", "");
return this;
},
@@ -421,27 +433,27 @@ app.views.Publisher = Backbone.View.extend({
if( this.disabled ) return;
// visually 'open' the publisher
- this.$el.removeClass('closed');
- this.el_wrapper.addClass('active');
-
- // fetch contacts for mentioning
- Mentions.fetchContacts();
+ this.$el.removeClass("closed");
+ this.wrapperEl.addClass("active");
+ autosize.update(this.inputEl);
return this;
},
close : function() {
$(this.el).addClass("closed");
- this.el_wrapper.removeClass("active");
- this.el_input.css('height', '');
- this.view_poll_creator.$el.hide();
+ this.wrapperEl.removeClass("active");
+ this.inputEl.css("height", "");
+ this.wrapperEl.removeClass("with-poll");
return this;
},
showSpinner: function(bool) {
- if (bool)
- this.$('#publisher_spinner').removeClass('hidden');
- else
- this.$('#publisher_spinner').addClass('hidden');
+ if (bool) {
+ this.$("#publisher_spinner").removeClass("hidden");
+ }
+ else {
+ this.$("#publisher_spinner").addClass("hidden");
+ }
},
checkSubmitAvailability: function() {
@@ -461,44 +473,38 @@ app.views.Publisher = Backbone.View.extend({
setButtonsEnabled: function(bool) {
if (bool) {
- this.el_submit.removeProp('disabled');
- this.el_preview.removeProp('disabled');
+ this.submitEl.removeAttr("disabled");
} else {
- this.el_submit.prop('disabled', true);
- this.el_preview.prop('disabled', true);
+ this.submitEl.prop("disabled", true);
}
},
setInputEnabled: function(bool) {
if (bool) {
- this.el_input.removeProp('disabled');
- this.el_hiddenInput.removeProp('disabled');
+ this.inputEl.removeAttr("disabled");
+ this.hiddenInputEl.removeAttr("disabled");
} else {
- this.el_input.prop('disabled', true);
- this.el_hiddenInput.prop('disabled', true);
+ this.inputEl.prop("disabled", true);
+ this.hiddenInputEl.prop("disabled", true);
}
},
// determine submit availability
_submittable: function() {
- var onlyWhitespaces = ($.trim(this.el_input.val()) === ''),
- isPhotoAttached = (this.el_photozone.children().length > 0),
- isValidPoll = this.view_poll_creator.validatePoll();
+ var onlyWhitespaces = ($.trim(this.inputEl.val()) === ""),
+ isPhotoAttached = (this.photozoneEl.children().length > 0),
+ isValidPoll = this.viewPollCreator.validatePoll();
return (!onlyWhitespaces || isPhotoAttached) && isValidPoll && !this.disabled;
},
handleTextchange: function() {
- var self = this;
-
this.checkSubmitAvailability();
- this.el_input.mentionsInput("val", function(value){
- self.el_hiddenInput.val(value);
- });
+ this.hiddenInputEl.val(this.mention.getTextForSubmit());
},
_beforeUnload: function(e) {
- if(this._submittable() && this.el_input.val() !== this.prefillText){
+ if(this._submittable() && this.inputEl.val() !== this.prefillText){
var confirmationMessage = Diaspora.I18n.t("confirm_unload");
(e || window.event).returnValue = confirmationMessage; //Gecko + IE
return confirmationMessage; //Webkit, Safari, Chrome, etc.
@@ -516,9 +522,9 @@ $.fn.serializeObject = function()
if (!o[this.name].push) {
o[this.name] = [o[this.name]];
}
- o[this.name].push(this.value || '');
+ o[this.name].push(this.value || "");
} else {
- o[this.name] = this.value || '';
+ o[this.name] = this.value || "";
}
});
return o;
diff --git a/app/assets/javascripts/app/views/reshares_info_view.js b/app/assets/javascripts/app/views/reshares_info_view.js
new file mode 100644
index 000000000..b91027e84
--- /dev/null
+++ b/app/assets/javascripts/app/views/reshares_info_view.js
@@ -0,0 +1,36 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.views.ResharesInfo = app.views.Base.extend({
+
+ templateName : "reshares-info",
+
+ events : {
+ "click .expand-reshares" : "showAvatars"
+ },
+
+ tooltipSelector : ".avatar",
+
+ initialize : function() {
+ this.model.interactions.bind("change", this.render, this);
+ this.displayAvatars = false;
+ },
+
+ presenter : function() {
+ return _.extend(this.defaultPresenter(), {
+ reshares : this.model.interactions.reshares.toJSON(),
+ resharesCount : this.model.interactions.resharesCount(),
+ displayAvatars : this.model.interactions.get("fetched") && this.displayAvatars
+ });
+ },
+
+ showAvatars : function(evt){
+ if(evt) { evt.preventDefault() }
+ this.displayAvatars = true;
+ if(!this.model.interactions.get("fetched")){
+ this.model.interactions.fetch();
+ } else {
+ this.model.interactions.trigger("change");
+ }
+ }
+});
+// @license-end
diff --git a/app/assets/javascripts/app/views/search_base_view.js b/app/assets/javascripts/app/views/search_base_view.js
new file mode 100644
index 000000000..72b032337
--- /dev/null
+++ b/app/assets/javascripts/app/views/search_base_view.js
@@ -0,0 +1,125 @@
+app.views.SearchBase = app.views.Base.extend({
+ initialize: function(options) {
+ this.ignoreDiasporaIds = [];
+ this.typeaheadInput = options.typeaheadInput;
+ this.setupBloodhound(options);
+ if(options.customSearch) { this.setupCustomSearch(); }
+ this.setupTypeahead();
+ // TODO: Remove this as soon as corejavascript/typeahead.js has its first release
+ this.setupMouseSelectionEvents();
+ if(options.autoselect) { this.setupAutoselect(); }
+ },
+
+ bloodhoundTokenizer: function(str) {
+ if(typeof str !== "string") { return []; }
+ return str.split(/[\s\.:,;\?\!#@\-_\[\]\{\}\(\)]+/).filter(function(s) { return s !== ""; });
+ },
+
+ setupBloodhound: function(options) {
+ var bloodhoundOptions = {
+ datumTokenizer: function(datum) {
+ // hashtags
+ if(typeof datum.handle === "undefined") { return [datum.name]; }
+ // people
+ if(datum.name === datum.handle) { return [datum.handle]; }
+ return this.bloodhoundTokenizer(datum.name).concat(datum.handle);
+ }.bind(this),
+ queryTokenizer: Bloodhound.tokenizers.whitespace,
+ sufficient: 5
+ };
+
+ // Allow bloodhound to look for remote results if there is a route given in the options
+ if(options.remoteRoute) {
+ bloodhoundOptions.remote = {
+ url: options.remoteRoute + ".json?q=%QUERY",
+ wildcard: "%QUERY",
+ transform: this.transformBloodhoundResponse
+ };
+ }
+
+ this.bloodhound = new Bloodhound(bloodhoundOptions);
+ },
+
+ setupCustomSearch: function() {
+ var self = this;
+ this.bloodhound.customSearch = function(query, sync, async) {
+ var _async = function(datums) {
+ var results = datums.filter(function(datum) {
+ return datum.handle !== undefined && self.ignoreDiasporaIds.indexOf(datum.handle) === -1;
+ });
+ async(results);
+ };
+
+ self.bloodhound.search(query, sync, _async);
+ };
+ },
+
+ setupTypeahead: function() {
+ this.typeaheadInput.typeahead({
+ hint: false,
+ highlight: true,
+ minLength: 2
+ }, {
+ async: true,
+ display: "name",
+ limit: 5,
+ source: this.bloodhound.customSearch !== undefined ? this.bloodhound.customSearch : this.bloodhound,
+ templates: {
+ /* jshint camelcase: false */
+ suggestion: HandlebarsTemplates.search_suggestion_tpl
+ /* jshint camelcase: true */
+ }
+ });
+ },
+
+ transformBloodhoundResponse: function(response) {
+ return response.map(function(data) {
+ // person
+ if(data.handle) {
+ data.person = true;
+ return data;
+ }
+
+ // hashtag
+ return {
+ hashtag: true,
+ name: data.name,
+ url: Routes.tag(data.name.substring(1))
+ };
+ });
+ },
+
+ _deselectAllSuggestions: function() {
+ this.$(".tt-suggestion").removeClass("tt-cursor");
+ },
+
+ _selectSuggestion: function(suggestion) {
+ this._deselectAllSuggestions();
+ suggestion.addClass("tt-cursor");
+ },
+
+ // TODO: Remove this as soon as corejavascript/typeahead.js has its first release
+ setupMouseSelectionEvents: function() {
+ var self = this,
+ selectSuggestion = function(e) { self._selectSuggestion($(e.target).closest(".tt-suggestion")); },
+ deselectAllSuggestions = function() { self._deselectAllSuggestions(); };
+
+ this.typeaheadInput.on("typeahead:render", function() {
+ self.$(".tt-menu .tt-suggestion").off("mouseover").on("mouseover", selectSuggestion);
+ self.$(".tt-menu .tt-suggestion *").off("mouseover").on("mouseover", selectSuggestion);
+ self.$(".tt-menu .tt-suggestion").off("mouseleave").on("mouseleave", deselectAllSuggestions);
+ });
+ },
+
+ // Selects the first result when the result dropdown opens
+ setupAutoselect: function() {
+ var self = this;
+ this.typeaheadInput.on("typeahead:render", function() {
+ self._selectSuggestion(self.$(".tt-menu .tt-suggestion").first());
+ });
+ },
+
+ ignorePersonForSuggestions: function(person) {
+ if(person.handle) { this.ignoreDiasporaIds.push(person.handle); }
+ },
+});
diff --git a/app/assets/javascripts/app/views/search_view.js b/app/assets/javascripts/app/views/search_view.js
index aed2e54ca..254bcb071 100644
--- a/app/assets/javascripts/app/views/search_view.js
+++ b/app/assets/javascripts/app/views/search_view.js
@@ -1,72 +1,35 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-app.views.Search = app.views.Base.extend({
- initialize: function(){
- this.searchFormAction = this.$el.attr('action');
- this.searchInput = this.$('input[type="search"]');
- this.searchInputName = this.$('input[type="search"]').attr('name');
- this.searchInputHandle = this.$('input[type="search"]').attr('handle');
- this.options = {
- cacheLength: 15,
- delay: 800,
- extraParams: {limit: 4},
- formatItem: this.formatItem,
- formatResult: this.formatResult,
- max: 5,
- minChars: 2,
- onSelect: this.selectItemCallback,
- parse: this.parse,
- scroll: false,
- context: this
- };
-
- var self = this;
- this.searchInput.autocomplete(self.searchFormAction + '.json',
- $.extend(self.options, { element: self.searchInput }));
+app.views.Search = app.views.SearchBase.extend({
+ events: {
+ "focusin #q": "toggleSearchActive",
+ "focusout #q": "toggleSearchActive",
+ "keypress #q": "inputKeypress"
},
- formatItem: function(row){
- if(typeof row.search !== 'undefined') { return Diaspora.I18n.t('search_for', row); }
- else {
- var item = '';
- if (row.avatar) { item += '' + row.handle + '
'; }
- return item;
- }
- },
-
- formatResult: function(row){ return Handlebars.Utils.escapeExpression(row.name); },
-
- parse: function(data) {
- var self = this.context;
-
- var results = data.map(function(person){
- person.name = self.formatResult(person);
- return {data : person, value : person.name};
+ initialize: function() {
+ this.searchInput = this.$("#q");
+ app.views.SearchBase.prototype.initialize.call(this, {
+ typeaheadInput: this.searchInput,
+ remoteRoute: this.$el.attr("action")
});
-
- results.push({
- data: {
- name: self.searchInput.val(),
- url: self.searchFormAction + '?' + self.searchInputName + '=' + self.searchInput.val(),
- search: true
- },
- value: self.searchInput.val()
- });
-
- return results;
+ this.searchInput.on("typeahead:select", this.suggestionSelected);
},
- selectItemCallback: function(evt, data, formatted){
- var self = this.context;
+ toggleSearchActive: function(evt) {
+ // jQuery produces two events for focus/blur (for bubbling)
+ // don't rely on which event arrives first, by allowing for both variants
+ var isActive = (_.indexOf(["focus","focusin"], evt.type) !== -1);
+ $(evt.target).toggleClass("active", isActive);
+ },
- if(data.search === true){
- window.location = self.searchFormAction + '?' + self.searchInputName + '=' + data.name;
- }
- else{ // The actual result
- self.options.element.val(formatted);
- window.location = data.url ? data.url : '/tags/' + data.name.substring(1);
+ inputKeypress: function(evt) {
+ if(evt.which === Keycodes.ENTER && $(".tt-suggestion.tt-cursor").length === 0) {
+ $(evt.target).closest("form").submit();
}
+ },
+
+ suggestionSelected: function(evt, datum) {
+ window.location = datum.url;
}
});
// @license-ends
diff --git a/app/assets/javascripts/app/views/sidebar.js b/app/assets/javascripts/app/views/sidebar.js
index d73dbf100..f5ce24b80 100644
--- a/app/assets/javascripts/app/views/sidebar.js
+++ b/app/assets/javascripts/app/views/sidebar.js
@@ -1,15 +1,19 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.Sidebar = app.views.Base.extend({
- el: '.rightBar',
+ el: ".info-bar",
events: {
- 'click input#invite_code': 'selectInputText'
+ "click input#invite_code": "selectInputText",
+ "click .section .title": "toggleSection"
},
selectInputText: function(event) {
event.target.select();
+ },
+
+ toggleSection: function(e) {
+ $(e.target).closest(".section").toggleClass("collapsed");
}
});
// @license-end
-
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
index ebb0a9dbf..63ef065f6 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
@@ -8,19 +8,19 @@ app.views.SinglePostCommentStream = app.views.CommentStream.extend({
},
highlightPermalinkComment: function() {
- if(document.location.hash){
+ if (document.location.hash && $(document.location.hash).length > 0) {
var element = $(document.location.hash);
- var headerSize = 50;
+ var headerSize = 60;
$(".highlighted").removeClass("highlighted");
element.addClass("highlighted");
var pos = element.offset().top - headerSize;
- $("html").animate({scrollTop:pos});
+ window.scroll(0, pos);
}
},
postRenderTemplate: function() {
app.views.CommentStream.prototype.postRenderTemplate.apply(this);
- this.$(".new_comment_form_wrapper").removeClass('hidden');
+ this.$(".new-comment-form-wrapper").removeClass("hidden");
_.defer(this.highlightPermalinkComment);
},
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
index 967b72f9f..c58cf08af 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
@@ -1,17 +1,17 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.SinglePostContent = app.views.Base.extend({
- templateName: 'single-post-viewer/single-post-content',
+ templateName: "single-post-viewer/single-post-content",
tooltipSelector: "time, .post_scope",
+ className: "framed-content",
subviews : {
"#single-post-actions" : "singlePostActionsView",
- '#single-post-moderation': "singlePostModerationView",
- '#real-post-content' : 'postContentView',
+ "#single-post-moderation": "singlePostModerationView",
+ "#real-post-content" : "postContentView",
".oembed" : "oEmbedView",
".opengraph" : "openGraphView",
- ".status-message-location" : "postLocationStreamView",
- '.poll': 'pollView',
+ ".poll": "pollView",
},
initialize : function() {
@@ -23,8 +23,25 @@ app.views.SinglePostContent = app.views.Base.extend({
this.pollView = new app.views.Poll({ model: this.model });
},
- postLocationStreamView : function(){
- return new app.views.LocationStream({ model : this.model});
+ map : function(){
+ if (this.$(".mapContainer").length < 1){ return; }
+
+ // find and set height of mapContainer to max size of the container
+ // which is necessary to have all necessary tiles prerendered
+ var mapContainer = this.$(".mapContainer");
+ mapContainer.css("height", "200px");
+
+ // get location data and render map
+ var location = this.model.get("location");
+
+ var map = L.map(mapContainer[0]).setView([location.lat, location.lng], 14);
+ var tiles = app.helpers.locations.getTiles();
+
+ tiles.addTo(map);
+
+ // put marker on map
+ L.marker(location).addTo(map);
+ return map;
},
presenter : function() {
@@ -37,6 +54,10 @@ app.views.SinglePostContent = app.views.Base.extend({
showPost : function() {
return (app.currentUser.get("showNsfw")) || !this.model.get("nsfw");
+ },
+
+ postRenderTemplate : function(){
+ _.defer(_.bind(this.map, this));
}
});
// @license-end
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
index b8c4a8661..9549a74a5 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
@@ -3,6 +3,7 @@
app.views.SinglePostInteractions = app.views.Base.extend({
templateName: "single-post-viewer/single-post-interactions",
tooltipSelector: ".avatar.micro",
+ className: "framed-content",
subviews: {
'#comments': 'commentStreamView'
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_moderation.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_moderation.js
index 8604d1adc..823783da3 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_moderation.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_moderation.js
@@ -1,7 +1,7 @@
app.views.SinglePostModeration = app.views.Feedback.extend({
templateName: "single-post-viewer/single-post-moderation",
- className: 'control-icons',
+ className: "control-icons",
events: function() {
return _.defaults({
@@ -19,7 +19,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
renderPluginWidgets : function() {
app.views.Base.prototype.renderPluginWidgets.apply(this);
- this.$('a').tooltip({placement: 'bottom'});
+ this.$("a").tooltip({placement: "bottom"});
},
authorIsCurrentUser: function() {
@@ -28,7 +28,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
destroyModel: function(evt) {
if(evt) { evt.preventDefault(); }
- var url = this.model.urlRoot + '/' + this.model.id;
+ var url = this.model.urlRoot + "/" + this.model.id;
if (confirm(Diaspora.I18n.t("remove_post"))) {
this.model.destroy({ url: url })
@@ -37,11 +37,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
document.location.href = "/stream";
})
.fail(function() {
- var flash = new Diaspora.Widgets.FlashMessages();
- flash.render({
- success: false,
- notice: Diaspora.I18n.t('failed_to_remove')
- });
+ app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
});
}
},
diff --git a/app/assets/javascripts/app/views/stream/shortcuts.js b/app/assets/javascripts/app/views/stream/shortcuts.js
index b09c6e753..dd62588c9 100644
--- a/app/assets/javascripts/app/views/stream/shortcuts.js
+++ b/app/assets/javascripts/app/views/stream/shortcuts.js
@@ -1,7 +1,7 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.StreamShortcuts = Backbone.View.extend({
- _headerSize: 50,
+ _headerSize: 60,
events: {
"keydown": "_onHotkeyDown",
@@ -57,35 +57,35 @@ app.views.StreamShortcuts = Backbone.View.extend({
gotoNext: function() {
// select next post: take the first post under the header
- var stream_elements = this.$('div.stream_element.loaded');
+ var streamElements = this.$("div.stream_element.loaded");
var posUser = window.pageYOffset;
- for (var i = 0; i < stream_elements.length; i++) {
- if(stream_elements[i].offsetTop>posUser+this._headerSize){
- this.selectPost(stream_elements[i]);
+ for (var i = 0; i < streamElements.length; i++) {
+ if (Math.round($(streamElements[i]).offset().top) > posUser + this._headerSize) {
+ this.selectPost(streamElements[i]);
return;
}
}
// standard: last post
- if(stream_elements[stream_elements.length-1]){
- this.selectPost(stream_elements[stream_elements.length-1]);
+ if (streamElements[streamElements.length - 1]) {
+ this.selectPost(streamElements[streamElements.length - 1]);
}
},
gotoPrev: function() {
// select previous post: take the first post above the header
- var stream_elements = this.$('div.stream_element.loaded');
+ var streamElements = this.$("div.stream_element.loaded");
var posUser = window.pageYOffset;
- for (var i = stream_elements.length-1; i >=0; i--) {
- if(stream_elements[i].offsetTop`, ``, and ``.
+// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace
+// $font-family-base: $font-family-sans-serif
+
+$font-size-base: 13px !default;
+// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px
+$font-size-small: 11px !default;
+
+// $font-size-h1: floor(($font-size-base * 2.6)) // ~36px
+// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px
+// $font-size-h3: ceil(($font-size-base * 1.7)) // ~24px
+// $font-size-h4: ceil(($font-size-base * 1.25)) // ~18px
+// $font-size-h5: $font-size-base
+// $font-size-h6: ceil(($font-size-base * 0.85)) // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+// $line-height-base: 1.428571429 // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+// $line-height-computed: floor(($font-size-base * $line-height-base)) // ~20px
+
+//** By default, this inherits from the ``.
+// $headings-font-family: inherit
+// $headings-font-weight: 500
+// $headings-line-height: 1.1
+// $headings-color: inherit
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
+// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/")
+
+//** File name for all font files.
+// $icon-font-name: "glyphicons-halflings-regular"
+//** Element ID within SVG icon file.
+// $icon-font-svg-id: "glyphicons_halflingsregular"
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+// $padding-base-vertical: 6px
+// $padding-base-horizontal: 12px
+
+// $padding-large-vertical: 10px
+// $padding-large-horizontal: 16px
+
+// $padding-small-vertical: 5px
+// $padding-small-horizontal: 10px
+
+// $padding-xs-vertical: 1px
+// $padding-xs-horizontal: 5px
+
+// $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome
+// $line-height-small: 1.5
+
+// $border-radius-base: 4px
+// $border-radius-large: 6px
+// $border-radius-small: 3px
+
+//** Global color for active items (e.g., navs or dropdowns).
+// $component-active-color: #fff
+//** Global background color for active items (e.g., navs or dropdowns).
+// $component-active-bg: $brand-primary
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+// $caret-width-base: 4px
+//** Carets increase slightly in size for larger components.
+// $caret-width-large: 5px
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ` `s.
+// $table-cell-padding: 8px
+//** Padding for cells in `.table-condensed`.
+// $table-condensed-cell-padding: 5px
+
+//** Default background color used for all tables.
+// $table-bg: transparent
+//** Background color used for `.table-striped`.
+// $table-bg-accent: #f9f9f9
+//** Background color used for `.table-hover`.
+// $table-bg-hover: #f5f5f5
+// $table-bg-active: $table-bg-hover
+
+//** Border color for table and cell borders.
+// $table-border-color: #ddd
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+// $btn-font-weight: normal
+
+// $btn-default-color: #333
+// $btn-default-bg: #fff
+// $btn-default-border: #ccc
+
+// $btn-primary-color: #fff
+// $btn-primary-bg: $brand-primary
+// $btn-primary-border: darken($btn-primary-bg, 5%)
+
+$btn-success-color: #333 !default;
+// $btn-success-bg: $brand-success
+// $btn-success-border: darken($btn-success-bg, 5%)
+
+// $btn-info-color: #fff
+// $btn-info-bg: $brand-info
+// $btn-info-border: darken($btn-info-bg, 5%)
+
+// $btn-warning-color: #fff
+// $btn-warning-bg: $brand-warning
+// $btn-warning-border: darken($btn-warning-bg, 5%)
+
+// $btn-danger-color: #fff
+// $btn-danger-bg: $brand-danger
+// $btn-danger-border: darken($btn-danger-bg, 5%)
+
+// $btn-link-disabled-color: $gray-light
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+// $input-bg: #fff
+//** `` background color
+// $input-bg-disabled: $gray-lighter
+
+//** Text color for ``s
+// $input-color: $gray
+//** `` border color
+// $input-border: #ccc
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `