You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/12/16 19:07:45 UTC
[1/2] fauxton commit: updated refs/heads/master to aa98987
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 4462944c7 -> aa989872d
Updating classname in CodeEditor View
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/aa989872
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/aa989872
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/aa989872
Branch: refs/heads/master
Commit: aa989872d7374e1bd2cc760c6d1fd50e5b5002f2
Parents: 1418c93
Author: Benjamin Keen <be...@gmail.com>
Authored: Fri Dec 12 10:18:09 2014 -0800
Committer: Benjamin Keen <be...@gmail.com>
Committed: Tue Dec 16 10:08:20 2014 -0800
----------------------------------------------------------------------
app/addons/documents/templates/code_editor.html | 6 +++---
app/addons/documents/views-doceditor.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aa989872/app/addons/documents/templates/code_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/code_editor.html b/app/addons/documents/templates/code_editor.html
index 2397157..8f0ab6d 100644
--- a/app/addons/documents/templates/code_editor.html
+++ b/app/addons/documents/templates/code_editor.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
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
@@ -10,7 +10,7 @@ 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="doc">
<div class="errors-container"></div>
@@ -18,7 +18,7 @@ the License.
<div id="doc-actions" class="nav">
<div class="span3">
<button class="save-doc btn btn-success save" type="button"><i class="icon fonticon-ok-circled"></i> Save</button>
- <button class="btn cancel-button">Back</button>
+ <button class="btn js-back">Back</button>
</div>
<div class="span7">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aa989872/app/addons/documents/views-doceditor.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-doceditor.js b/app/addons/documents/views-doceditor.js
index 1eca318..7ed59ad 100644
--- a/app/addons/documents/views-doceditor.js
+++ b/app/addons/documents/views-doceditor.js
@@ -210,7 +210,7 @@ function (app, FauxtonAPI, Components, Documents, Databases, resizeColumns, pret
'click button.delete': 'destroy',
'click button.duplicate': 'duplicate',
'click button.upload': 'upload',
- 'click button.cancel-button': 'goback',
+ 'click button.js-back': 'goback',
'click button.string-edit': 'stringEditing'
},
[2/2] fauxton commit: updated refs/heads/master to aa98987
Posted by be...@apache.org.
Clicking cancel in clone doc modal fix
Before, clicking cancel in the Clone Document modal found on the doc
editor page would redirect you back to previous page. This isn't what
you'd want or expect. Now it just closes the modal.
Closes COUCHDB-2509
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1418c934
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1418c934
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1418c934
Branch: refs/heads/master
Commit: 1418c934334d4b331a5b178187bc257fcb9379ac
Parents: 4462944
Author: Benjamin Keen <be...@gmail.com>
Authored: Thu Dec 11 16:49:47 2014 -0800
Committer: Benjamin Keen <be...@gmail.com>
Committed: Tue Dec 16 10:08:20 2014 -0800
----------------------------------------------------------------------
app/addons/documents/templates/duplicate_doc_modal.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1418c934/app/addons/documents/templates/duplicate_doc_modal.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/duplicate_doc_modal.html b/app/addons/documents/templates/duplicate_doc_modal.html
index a4868ff..bab4067 100644
--- a/app/addons/documents/templates/duplicate_doc_modal.html
+++ b/app/addons/documents/templates/duplicate_doc_modal.html
@@ -1,4 +1,4 @@
-<!--
+<% /*
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
@@ -10,7 +10,7 @@ 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 class="modal hide fade">
<div class="modal-header">
@@ -28,7 +28,7 @@ the License.
</div>
<div class="modal-footer">
- <button data-dismiss="modal" class="btn cancel-button"><i class="icon fonticon-cancel-circled"></i> Cancel</button>
+ <button data-dismiss="modal" class="btn"><i class="icon fonticon-cancel-circled"></i> Cancel</button>
<button id="duplicate-btn" class="btn btn-success save"><i class="fonticon-ok-circled"></i> Clone</button>
</div>
</div>