Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A003E11AC6 for ; Mon, 14 Jul 2014 08:39:42 +0000 (UTC) Received: (qmail 47298 invoked by uid 500); 14 Jul 2014 08:39:42 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 47228 invoked by uid 500); 14 Jul 2014 08:39:42 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 47212 invoked by uid 99); 14 Jul 2014 08:39:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jul 2014 08:39:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 419A28BD4D2; Mon, 14 Jul 2014 08:39:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Mon, 14 Jul 2014 08:39:42 -0000 Message-Id: <9f0e2520adbe447a8164dcd441ed2f23@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] fauxton commit: updated refs/heads/master to b9a5eae Repository: couchdb-fauxton Updated Branches: refs/heads/master 0ec46e9fe -> b9a5eaefe remove whitespace Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/919442c6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/919442c6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/919442c6 Branch: refs/heads/master Commit: 919442c641781cf383613a2f0a1cf71440d8c452 Parents: 0ec46e9 Author: Robert Kowalski Authored: Thu May 29 21:08:05 2014 +0200 Committer: Alexander Shorin Committed: Mon Jul 14 12:39:00 2014 +0400 ---------------------------------------------------------------------- app/addons/fauxton/resizeColumns.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/919442c6/app/addons/fauxton/resizeColumns.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js index 1cdaca8..b2c938c 100644 --- a/app/addons/fauxton/resizeColumns.js +++ b/app/addons/fauxton/resizeColumns.js @@ -12,7 +12,7 @@ // This file creates a set of helper functions that will be loaded for all html -// templates. These functions should be self contained and not rely on any +// templates. These functions should be self contained and not rely on any // external dependencies as they are loaded prior to the application. We may // want to change this later, but for now this should be thought of as a // "purely functional" helper system. @@ -35,12 +35,12 @@ function(FauxtonAPI) { }, getPanelWidth: function(){ var sidebarWidth = $('#sidebar-content').length > 0 ? $('#sidebar-content').width(): 0; - return (this.getPrimaryNavWidth() + sidebarWidth); + return (this.getPrimaryNavWidth() + sidebarWidth); }, initialize: function(){ // $(window).off('resize'); var that = this; - //add throttler :) + //add throttler :) this.lazyLayout = _.debounce(that.onResizeHandler, 300).bind(this); FauxtonAPI.utils.addWindowResize(this.lazyLayout,"animation"); FauxtonAPI.utils.initWindowResize(); @@ -64,7 +64,7 @@ function(FauxtonAPI) { } else { var combinedWidth = window.innerWidth - this.getPanelWidth(), smallWidthConstraint = ($('#sidebar-content').length > 0)? 470:800, - panelWidth; + panelWidth; if( combinedWidth > smallWidthConstraint && combinedWidth < 1400){ panelWidth = window.innerWidth - this.getPanelWidth(); @@ -75,14 +75,14 @@ function(FauxtonAPI) { } $(this.options.selectorElements).innerWidth(panelWidth); - + } //if there is a callback, run that if(this.options.callback) { this.options.callback(); } this.trigger('resize'); - } + } }; _.extend(Resize.prototype, Backbone.Events);