couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [27/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins to 8aad450
Date Mon, 09 Sep 2013 09:53:47 GMT
Fauxton: add in error messages for view query


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

Branch: refs/heads/1867-feature-plugins
Commit: 41203f8ba30efd7ad1258aaf7ed363f32dba0684
Parents: 613821a
Author: Garren Smith <garren.smith@gmail.com>
Authored: Thu Aug 22 12:43:04 2013 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Mon Sep 9 11:16:44 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js           | 8 +++-----
 src/fauxton/app/templates/documents/view_editor.html | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/41203f8b/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 9e1279f..d43f06c 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -919,18 +919,16 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint, resizeColumns)
           // TODO: Where to add this error?
           // bootstrap wants the error on a control-group div, but we're not using that
           //$('form.view-query-update input[name='+param+'], form.view-query-update select[name='+param+']').addClass('error');
-
           return FauxtonAPI.addNotification({
             msg: "JSON Parse Error on field: "+param.name,
             type: "error",
-            selector: ".view.show .all-docs-list.errors-container"
+            selector: ".advanced-options .errors-container"
           });
         });
-
         FauxtonAPI.addNotification({
           msg: "Make sure that strings are properly quoted and any other values are valid
JSON structures",
           type: "warning",
-          selector: ".view.show .all-docs-list.errors-container"
+          selector: ".advanced-options .errors-container"
         });
 
         return false;
@@ -994,7 +992,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint, resizeColumns)
       FauxtonAPI.addNotification({
         msg: "<strong>Warning!</strong> Preview executes the Map/Reduce functions
in your browser, and may behave differently from CouchDB.",
         type: "warning",
-        selector: ".advanced-options",
+        selector: ".advanced-options .errors-container",
         fade: true
       });
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/41203f8b/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index b584208..9aaa503 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -107,6 +107,7 @@ the License.
     </div>
     <div class="tab-pane" id="query">
       <div class="advanced-options well">
+        <div class="errors-container"></div>
         <form class="view-query-update custom-inputs">
           <div class="controls-group">
             <div class="row-fluid">


Mime
View raw message