Merge pull request BigBlueHat#18 from garrensmith/remove_auto_save

Remove auto save
79bytes · Jul 2, 2012 · a162dae · a162dae
2 parents f3ca299 + 244929a
commit a162dae
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 37 deletions.
diff --git a/_attachments/style/layout.css b/_attachments/style/layout.css
@@ -283,14 +283,14 @@ body.fullwidth #wrap { margin-right: 0; }
 #toolbar li.current {float:right;}
 #toolbar li.right-side {float:right;}
 #toolbar button { background: transparent 2px 2px no-repeat; border: none;
-  color: #666; margin: 0; padding: 2px 0em 2px 22px; cursor: pointer;
+  color: #666; margin: 0; padding: 2px 1em 2px 22px; cursor: pointer;
   font-size: 95%; line-height: 16px;
 }
 #toolbar button:hover { background-position: 2px -30px; color: #000; }
 #toolbar button:active { background-position: 2px -62px; color: #000; }
 #toolbar button.add { background-image: url(../image/add.png); }
 #toolbar button.security { background-image: url(../image/key.png); }
-#toolbar button.compact { background-image: url(../image/compact.png); float:right;}
+#toolbar button.compact { background-image: url(../image/compact.png); }
 #toolbar button.delete { background-image: url(../image/delete.png); }
 #toolbar button.load { background-image: url(../image/load.png); }
 #toolbar button.run { background-image: url(../image/run.png); }

diff --git a/_attachments/templates/database.mustache b/_attachments/templates/database.mustache
@@ -17,6 +17,8 @@ specific language governing permissions and limitations under the License.
 </div>
 <ul id="toolbar">
   <li><button class="add">New Document</button></li>
+  <li class="right-side"><button class="delete">Delete Database</button></li>
+  <li class="right-side"><button class="compact">Compact &amp; Cleanup</button></li>
   <!-- <li><button class="security">Security…</button></li> -->
 </ul>
 
@@ -48,8 +50,6 @@ specific language governing permissions and limitations under the License.
   </tbody>
 </table>
 <ul id="toolbar">
-  <li><button class="delete">Delete Database</button></li>
-  <li><button class="compact">Compact &amp; Cleanup</button></li>
 </ul>
 
 <div id="dbinfo">
@@ -62,4 +62,4 @@ specific language governing permissions and limitations under the License.
   <div class="info-title">Document Store Size </div><div class="info-value" id="disk_size"></div>
   <div class="info-title">View Index Size </div><div class="info-value" id="views_size"></div>
   <div class="info-title">Full Database Size </div><div class="info-value" id="full_size"></div>
-</div>
+</div>
diff --git a/_attachments/templates/document.mustache b/_attachments/templates/document.mustache
@@ -14,17 +14,13 @@ specific language governing permissions and limitations under the License.
 -->
 <ul id="toolbar">
   <li><button class="load">Upload Attachment…</button></li>
+  <li><button id="save-button" class="save">Save Document</button></li>
   <li class="right-side"><button class="delete">Delete Document…</button></li>
 </ul>
 
 <div id="document-container">
   <div id="document-editor">
     <span id="expand-all">...</span>
-    <div id="autosave">
-      <input id="autosave-input" type="checkbox" checked></input>
-      <span id="autosave-txt">auto-save</span>
-      <span id="save-button" style="display:none" class="save-disabled">save</span>
-    </div>
   </div>
 </div>
 <div class="spacer"></div>
@@ -83,9 +79,6 @@ $('button.delete').click(function () {
 $('span#expand-all').click(function () {
   $('span.expand').click(); 
 })
-var saveDisabled = {cursor:"default", "background-color": "#ddd", color:"white"};
-var saveEnabled = {cursor:"pointer", "background-color": "#D1D1D1", color:"#575757"};
-$("span#save-button").css(saveDisabled)
 
 var save = function (cb, force) {
   var doSave = function () {
@@ -112,22 +105,19 @@ var save = function (cb, force) {
       cb()
     })
   }
+  doSave();
   
-  if (!$("input#autosave-input").attr('checked')) {
-    $("input#autosave-input").attr('disabled', true);
-    $("span#save-button")
-    .css(saveEnabled)
-    .unbind('click')
-    .click( function () {
+}
+
+$("#save-button").click( function () {
+      $("#save-button").attr("disabled","disabled");
+      $("#save-button").text("Saving...");
       save(function () {
-        $("input#autosave-input").attr('disabled', false);
-        $("span#save-button").unbind('click').css(saveDisabled);
+        $("#save-button").text("Save Document");
+        $("#save-button").removeAttr("disabled")
       }, true)
-    })
-    if (force) {doSave()}
-    else (cb())
-  } else {doSave();}   
-}
+    });
+
 
 var getEdit = function (obj, key, val, minWidth) {
   var edit = function () {
@@ -149,10 +139,8 @@ var getEdit = function (obj, key, val, minWidth) {
       .height(h)
       .change(function () {
         obj[key] = coerceFieldValue( $(this).val() );
-        save(function (){
-          val.parent().append(createValue[getType(obj[key])](obj, key, true));
-          val.remove();
-        })
+        val.parent().append(createValue[getType(obj[key])](obj, key, true));
+        val.remove();
       })
     )
     
@@ -433,13 +421,7 @@ request({url:url+'?'+param(docQuery)}, function (err, resp) {
     }
     
   } else {
-    // Autosave enable and disable
-    $("input#autosave-input").click( function () {
-      var disable = !$("input#autosave-input").attr('checked');
-      $("span#autosave-txt")[disable ? "hide" : "show"]()
-      $("span#save-button")[disable ? "show" : "hide"]()
-    })
-  
+
     var d = $('div#document-editor');
     for (i in resp) {
       var field = $('<div class="doc-field"></div>')