You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/10/06 19:27:26 UTC
[2/2] fauxton commit: updated refs/heads/master to 92964af
whitespace fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1d79b3e1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1d79b3e1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1d79b3e1
Branch: refs/heads/master
Commit: 1d79b3e1b38e8ebee0564f455f3ce355dedba4a9
Parents: eff09ef
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Mon Oct 6 09:47:26 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Oct 6 19:27:09 2014 +0200
----------------------------------------------------------------------
app/addons/documents/views-doceditor.js | 16 ++++++++--------
app/core/utils.js | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1d79b3e1/app/addons/documents/views-doceditor.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-doceditor.js b/app/addons/documents/views-doceditor.js
index 3633edc..bd15596 100644
--- a/app/addons/documents/views-doceditor.js
+++ b/app/addons/documents/views-doceditor.js
@@ -104,7 +104,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, resizeColumns, prett
events: {
"click #string-edit-save-btn":"saveString"
},
-
+
saveString: function (event) {
event.preventDefault();
var newStr = this.subEditor.getValue();
@@ -117,12 +117,12 @@ function(app, FauxtonAPI, Components, Documents, Databases, resizeColumns, prett
this.$('.bar').css({width: '0%'});
this.$('.progress').addClass('hide');
this.clear_error_msg();
- },
+ },
openWin: function(editor, indent, hashKey, jsonString, comma) {
this.editor = editor;
this.indent = indent;
- this.hashKey = hashKey;
+ this.hashKey = hashKey;
this.$('#string-edit-header').text(hashKey);
this.subEditor.setValue(JSON.parse(jsonString));
/* make sure we don't have save warnings w/out change */
@@ -229,17 +229,17 @@ function(app, FauxtonAPI, Components, Documents, Databases, resizeColumns, prett
var selStart = this.editor.getSelectionStart().row;
var selEnd = this.editor.getSelectionEnd().row;
/* one JS(ON) string can't span more than one line - we edit one string, so ensure we don't select several lines */
- if (selStart >=0 && selEnd >= 0 && selStart === selEnd && this.editor.isRowExpanded(selStart)) {
+ if (selStart >=0 && selEnd >= 0 && selStart === selEnd && this.editor.isRowExpanded(selStart)) {
var editLine = this.editor.getLine(selStart),
editMatch = editLine.match(/^([ \t]*)("[a-zA-Z0-9_]*": )?(".*",?[ \t]*)$/);
if (editMatch) {
return editMatch;
}
- }
+ }
return null;
- },
+ },
showHideEditDocString: function (event) {
this.$("button.string-edit").attr("disabled", "true");
@@ -258,7 +258,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, resizeColumns, prett
},
stringEditing: function(event) {
- event.preventDefault();
+ event.preventDefault();
if (!this.hasValidCode()) {
return;
}
@@ -269,7 +269,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, resizeColumns, prett
editText = editMatch[3],
comma = "";
if (editText.substring(editText.length - 1) === ",") {
- editText = editText.substring(0, editText.length - 1);
+ editText = editText.substring(0, editText.length - 1);
comma = ",";
}
this.stringEditModal.openWin(this.editor, indent, hashKey, editText, comma);
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1d79b3e1/app/core/utils.js
----------------------------------------------------------------------
diff --git a/app/core/utils.js b/app/core/utils.js
index 6bc8aea..cc8b02a 100644
--- a/app/core/utils.js
+++ b/app/core/utils.js
@@ -23,7 +23,7 @@ define([
"lodash"
],
-function($, _ ) {
+function ($, _) {
var onWindowResize = {};