Commit 31f313e2 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Refactor creation of comments URL-s to single place. 

All Ajax and JsonP request for comments data are now performed
through a custom #request method that appends server and session ID data
to the given URL.
parent 82a4dff6

template/app/controller/AuthHelpers.js

+22 −0
Original line number Diff line number Diff line
@@ -3,6 +3,27 @@ 
 */

Ext.define('Docs.controller.AuthHelpers', {



    /**

     * Performs request to the comments server.

     *

     * Works as if calling Ext.Ajax.request or Ext.data.JsonP.request

     * directly, but prefixes the URL with docs base URL and database

     * name and adds Session ID.

     *

     * @param {String} proxy Should we perform "ajax" or "jsonp" request.

     * @param {Object} config

     * @protected

     */

    request: function(type, config) {

        config.url = this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + config.url);

        if (type === "jsonp") {

            Ext.data.JsonP.request(config);

        }

        else {

            Ext.Ajax.request(config);

        }

    },



    addSid: function(url) {

        var sid = this.getController('Auth').sid;

        return url + (url.match(/\?/) ? '&' : '?') + 'sid=' + sid;
@@ -11,4 +32,5 @@ Ext.define('Docs.controller.AuthHelpers', { 
    loggedIn: function() {

        return this.getController('Auth').isLoggedIn();

    }



});

template/app/controller/Comments.js

+19 −21
Original line number Diff line number Diff line
@@ -168,12 +168,10 @@ Ext.define('Docs.controller.Comments', { 
    fetchComments: function(id, callback, opts) {

        var startkey = Ext.JSON.encode(this.commentId(id)),

            endkey = Ext.JSON.encode(this.commentId(id).concat([{}])),

            currentUser = this.getController('Auth').currentUser,

            // url = Docs.baseUrl + '/' + Docs.commentsDb + '/_design/Comments/_view/by_target';

            url = Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments';

            currentUser = this.getController('Auth').currentUser;



        Ext.data.JsonP.request({

            url: url,

        this.request("jsonp", {

            url: '/comments',

            method: 'GET',

            params: {

                reduce: false,
@@ -241,8 +239,8 @@ Ext.define('Docs.controller.Comments', { 
            title += ' ' + target[2];

        }



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments'),

        this.request("ajax", {

            url: '/comments',

            method: 'POST',

            cors: true,

            params: {
@@ -276,8 +274,8 @@ Ext.define('Docs.controller.Comments', { 
     * Fetches the most recent comments

     */

    fetchRecentComments: function(id, offset) {

        Ext.data.JsonP.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments_recent'),

        this.request("jsonp", {

            url: '/comments_recent',

            method: 'GET',

            params: {

                offset: offset || 0,
@@ -309,8 +307,8 @@ Ext.define('Docs.controller.Comments', { 
            commentsEl = Ext.get(el).up('.comments-div'),

            target = commentsEl && commentsEl.getAttribute('id');



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments/' + id + '/delete'),

        this.request("ajax", {

            url: '/comments/' + id + '/delete',

            cors: true,

            method: 'POST',

            callback: function(options, success, response) {
@@ -343,8 +341,8 @@ Ext.define('Docs.controller.Comments', { 
        var commentsEl = commentEl.up('.comments-div');

        var target = commentsEl && commentsEl.getAttribute('id');



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments/' + id + '/undo_delete'),

        this.request("ajax", {

            url: '/comments/' + id + '/undo_delete',

            cors: true,

            method: 'POST',

            callback: function(options, success, response) {
@@ -371,8 +369,8 @@ Ext.define('Docs.controller.Comments', { 
            contentEl = commentEl.down('.content'),

            currentUser = this.getController('Auth').currentUser;



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments/' + commentId),

        this.request("ajax", {

            url: '/comments/' + commentId,

            method: 'GET',

            cors: true,

            callback: function(options, success, response) {
@@ -411,8 +409,8 @@ Ext.define('Docs.controller.Comments', { 
        }

        postButton.addCls('disabled');



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments/' + id),

        this.request("ajax", {

            url: '/comments/' + id,

            method: 'POST',

            cors: true,

            params: {
@@ -453,8 +451,8 @@ Ext.define('Docs.controller.Comments', { 
            commentId = commentEl.getAttribute('id'),

            subscribed = el.checked;



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/subscribe'),

        this.request("ajax", {

            url: '/subscribe',

            method: 'POST',

            cors: true,

            params: {
@@ -494,8 +492,8 @@ Ext.define('Docs.controller.Comments', { 
            meta = Ext.get(el).up('.com-meta'),

            scoreEl = meta.down('.score');



        Ext.Ajax.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments/' + id),

        this.request("ajax", {

            url: '/comments/' + id,

            cors: true,

            method: 'POST',

            params: { vote: direction },

template/app/controller/CommentsMeta.js

+4 −4
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ Ext.define('Docs.controller.CommentsMeta', { 
     * Fetch all comment meta data and populate a local store

     */

    fetchCommentMeta: function() {

        Ext.data.JsonP.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/comments_meta'),

        this.request("jsonp", {

            url: '/comments_meta',

            method: 'GET',

            success: function(response) {

                Ext.Array.each(response.comments, function(r) {
@@ -129,8 +129,8 @@ Ext.define('Docs.controller.CommentsMeta', { 
     * Fetch all comment meta data and populate a local store

     */

    fetchSubscriptionMeta: function() {

        Ext.data.JsonP.request({

            url: this.addSid(Docs.baseUrl + '/' + Docs.commentsDb + '/' + Docs.commentsVersion + '/subscriptions'),

        this.request("jsonp", {

            url: '/subscriptions',

            method: 'GET',

            success: function(response) {

                Ext.Array.each(response.subscriptions, function(r) {