Clean up for bugs and non save/preview use

3 files changed, 21 insertions, 13 deletions

diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 3b9b18086..451ca2429 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -661,7 +661,7 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
     initialize: function(options) {
       this.ddocs = options.ddocs;
       this.viewCollection = options.viewCollection;
-      this.hasReduce = this.model.viewHasReduce(this.viewCollection.view);
+      this.reduceFunStr = this.model.viewHasReduce(this.viewCollection.view);
       this.newView = false;
     },
 
@@ -711,10 +711,17 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
       if (this.hasValidCode()) {
         var mapVal = this.mapEditor.getValue();
         var reduceVal = this.reduceEditor.getValue();
+        /*
         notification = FauxtonAPI.addNotification({
           msg: "Saving document.",
           selector: "#define-view .errors-container"
         });
+        */
+        FauxtonAPI.addNotification({
+          msg: "Save Functionality Coming Soon",
+          type: "warning",
+          selector: "#define-view .errors-container"
+        });
         /*
         this.model.save().error(function(xhr) {
           var responseText = JSON.parse(xhr.responseText).reason;
@@ -791,17 +798,17 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
         ddocs: this.ddocs,
         ddoc: this.model,
         viewCollection: this.viewCollection,
-        hasReduce: this.hasReduce,
+        reduceFunStr: this.reduceFunStr,
+        isCustomReduce: this.hasCustomReduce(),
         newView: this.newView
       };
     },
 
     hasCustomReduce: function() {
-      return this.hasReduce && ! _.contains(this.builtinReduces, this.hasReduce);
+      return this.reduceFunStr && ! _.contains(this.builtinReduces, this.reduceFunStr);
     },
 
     afterRender: function() {
-      //this.model.on("sync", this.updateValues, this);
       var that = this;
       var mapFun = $("#map-function");
       var reduceFun = $("#reduce-function");
@@ -818,7 +825,7 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
           that.runJSHint("mapEditor");
         },
         extraKeys: {
-          "Ctrl-S": function(instance) { that.saveDoc(); },
+          "Ctrl-S": function(instance) { that.saveView(); },
           "Ctrl-/": "undo"
         }
       });
@@ -831,7 +838,7 @@ function(app, FauxtonAPI, Codemirror, JSHint) {
           that.runJSHint("reduceEditor");
         },
         extraKeys: {
-          "Ctrl-S": function(instance) { that.saveDoc(); },
+          "Ctrl-S": function(instance) { that.saveView(); },
           "Ctrl-/": "undo"
         }
       });
diff --git a/src/fauxton/app/templates/documents/all_docs_list.html b/src/fauxton/app/templates/documents/all_docs_list.html
index cb8c55d97..423a80d03 100644
--- a/src/fauxton/app/templates/documents/all_docs_list.html
+++ b/src/fauxton/app/templates/documents/all_docs_list.html
@@ -122,6 +122,7 @@ the License.
   <table class="all-docs table table-striped table-condensed">
     <tbody></tbody>
   </table>
+  <!--
   <div class="pagination pagination-centered">
     <ul>
       <li class="disabled"><a href="#">&laquo;</a></li>
@@ -133,5 +134,6 @@ the License.
       <li><a href="#">&raquo;</a></li>
     </ul>
   </div>
+  -->
 
 </div>
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 1eceac2a0..4a8668e29 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -19,7 +19,7 @@ the License.
         <i class="icon-wrench"></i> Edit Index
       </a>
     </div>
-    <div id="collapse-edit-index" class="accordion-body collapse in">
+    <div id="collapse-edit-index" class="accordion-body collapse">
       <div class="accordion-inner">
         <div id="define-view" class="ddoc-alert well">
           <div class="errors-container"></div>
@@ -59,12 +59,11 @@ the License.
               <label class="control-label" for="reduce-function-selector">Reduce function <a target="_couch_docs" href="http://docs.couchdb.org/en/latest/ddocs/#reduce-and-rereduce-functions"><i class="icon-question-sign"></i></a></label>
               <div class="controls">
                 <select id="reduce-function-selector">
-                  <% console.log("HAS REDUCE: ",hasReduce) %>
-                  <option value="" <%= !hasReduce ? 'selected="selected"' : '' %>>None</option>
-                  <option value="_sum">_sum</option>
-                  <option value="_count">_count</option>
-                  <option value="_stats">_stats</option>
-                  <option value="CUSTOM" <%= hasReduce ? 'selected="selected"' : '' %>>Custom reduce</option>
+                  <option value="" <%= !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
+                  <% _.each(["_sum", "_count", "_stats"], function(reduce) { %>
+                    <option value="<%= reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
+                  <% }) %>
+                  <option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom reduce</option>
                 </select>
                 <span class="help-block">Reduce functions are optional.</span>
               </div>