couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [2/2] git commit: updated refs/heads/master to d38c68b
Date Mon, 04 Nov 2013 19:51:24 GMT
Removing login_pane since it's not used.
Fixing buttons on advanced options
Fixing Ace editor issue when hide/show toggling.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d38c68b7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d38c68b7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d38c68b7

Branch: refs/heads/master
Commit: d38c68b7dfd06a7811091e7435b129011560c4d7
Parents: 5d4ac9b
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Mon Nov 4 14:48:46 2013 -0500
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Mon Nov 4 14:48:46 2013 -0500

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js         |  4 +++-
 .../app/templates/documents/advanced_options.html  |  4 ++--
 src/fauxton/app/templates/layouts/login_pane.html  | 17 -----------------
 3 files changed, 5 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d38c68b7/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 5c22504..b76d238 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -1378,7 +1378,8 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns)
{
       if ($targetId === 'index-nav') {
         if (this.newView) { return; }
         $index.toggle('slow');
-        this.showEditors();
+        var that = this;
+        setTimeout(function(){that.showEditors();},100);
       } else {
         $index.removeAttr('style');
       }
@@ -1478,6 +1479,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns)
{
         this.mapEditor.setValue(this.langTemplates[this.defaultLang].map);
         this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce);
       } 
+
     }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d38c68b7/src/fauxton/app/templates/documents/advanced_options.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/advanced_options.html b/src/fauxton/app/templates/documents/advanced_options.html
index c0bf44a..d6cff79 100644
--- a/src/fauxton/app/templates/documents/advanced_options.html
+++ b/src/fauxton/app/templates/documents/advanced_options.html
@@ -82,9 +82,9 @@ the License.
   <div class="controls-group">
     <div class="row-fluid">
       <div id="button-options" class="controls controls-row">
-        <button type="submit" class="btn btn-primary btn-large">Query</button>
+        <button type="submit" class="button btn-primary btn-large">Query</button>
         <% if (showPreview) { %>
-        <button class="btn btn-info btn-large preview">Preview</button>
+        <button class="button btn-info btn-large preview">Preview</button>
         <% } %>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d38c68b7/src/fauxton/app/templates/layouts/login_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/login_pane.html b/src/fauxton/app/templates/layouts/login_pane.html
deleted file mode 100644
index e145eef..0000000
--- a/src/fauxton/app/templates/layouts/login_pane.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
--->
-
-<div id="login">
-	<div id="login-wrapper"></div>
-</div>
\ No newline at end of file


Mime
View raw message