Fauxton fix build
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/86b6a144 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/86b6a144 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/86b6a144 Branch: refs/heads/api-options Commit: 86b6a1448aec8e18b090c17ec08823dd414545c8 Parents: 4b69ff3 Author: Garren Smith <[email protected]> Authored: Mon Jan 13 14:42:40 2014 +0200 Committer: Garren Smith <[email protected]> Committed: Mon Jan 13 14:42:40 2014 +0200 ---------------------------------------------------------------------- license.skip | 9 ++++++--- src/Makefile.am | 6 +++--- .../app/addons/documents/assets/less/documents.less | 11 +++++++++++ src/fauxton/app/addons/documents/views.js | 7 +++++-- src/fauxton/app/addons/pouchdb/base.js | 11 +++++++++++ .../app/templates/documents/duplicate_doc_modal.html | 2 +- src/fauxton/test/core/layoutSpec.js | 2 +- src/fauxton/test/core/navbarSpec.js | 2 +- src/fauxton/test/core/paginateSpec.js | 4 ++-- 9 files changed, 41 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/license.skip ---------------------------------------------------------------------- diff --git a/license.skip b/license.skip index 0895cf8..984d869 100644 --- a/license.skip +++ b/license.skip @@ -124,9 +124,6 @@ ^src/ejson/.* ^src/etap/.* ^src/fauxton/app/addons/config/assets/less/config.less -^src/fauxton/app/modules/pouchdb/base.js -^src/fauxton/app/modules/pouchdb/pouch.collate.js -^src/fauxton/app/modules/pouchdb/pouchdb.mapreduce.js ^src/fauxton/assets/css/codemirror.css ^src/fauxton/assets/css/nv.d3.css ^src/fauxton/assets/img/.* @@ -152,6 +149,8 @@ ^src/fauxton/test/mocha/sinon-chai.js ^src/fauxton/tasks/addon/rename.json ^src/fauxton/assets/lib/ace/.* +^src/fauxton/app/addons/pouchdb/pouch.collate.js +^src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js ^src/ibrowse/.* ^src/mochiweb/.* ^src/my-first-couchdb-plugin/priv/*/* @@ -184,3 +183,7 @@ ^var/Makefile ^var/Makefile.in ^Vagrantfile +^share/www/fauxton/Makefile +^share/www/fauxton/Makefile.in +^share/www/Makefile +^share/www/Makefile.in http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index cb37384..4302048 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -273,12 +273,12 @@ FAUXTON_FILES = \ fauxton/assets/less/bootstrap/utilities.less \ fauxton/assets/less/bootstrap/variables.less \ fauxton/assets/less/bootstrap/wells.less \ - fauxton/addons/config/assets/less/config.less \ + fauxton/app/addons/config/assets/less/config.less \ fauxton/assets/less/couchdb.less \ - fauxton/addons/databases/assets/less/databases.less \ + fauxton/app/addons/databases/assets/less/databases.less \ fauxton/assets/less/fauxton.less \ fauxton/assets/less/icons.less \ - fauxton/addons/logs/assets/less/logs.less \ + fauxton/app/addons/logs/assets/less/logs.less \ fauxton/assets/less/prettyprint.less \ fauxton/assets/less/variables.less \ fauxton/bin/grunt \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less index ff9e88c..38fd792 100644 --- a/src/fauxton/app/addons/documents/assets/less/documents.less +++ b/src/fauxton/app/addons/documents/assets/less/documents.less @@ -1,3 +1,14 @@ +// 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 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// 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. /*ALL DOCS TABLE*/ tr.all-docs-item{ border: none; http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 80c0d87..94332a2 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -234,7 +234,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum }, events: { - "click #duplicate-btn":"duplicate" + "click #duplicate-btn":"duplicate", + "submit #doc-duplicate": "duplicate" }, @@ -1481,6 +1482,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum promise.then(function () { params.docs = that.database.allDocs.map(function (model) { return model.get('doc');}); + console.log('p', params, paramsInfo); var queryPromise = pouchdb.runViewQuery({map: mapVal, reduce: reduceVal}, params); queryPromise.then(function (results) { FauxtonAPI.triggerRouteEvent('updatePreviewDocs', {rows: results.rows, ddoc: that.getCurrentDesignDoc().id, view: that.viewName}); @@ -1507,8 +1509,9 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum reduceVal: function() { var reduceOption = this.$('#reduce-function-selector :selected').val(), reduceVal = ""; - + if (reduceOption === 'CUSTOM') { + if (!this.reduceEditor) { this.createReduceEditor(); } reduceVal = this.reduceEditor.getValue(); } else if ( reduceOption !== 'NONE') { reduceVal = reduceOption; http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/app/addons/pouchdb/base.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/pouchdb/base.js b/src/fauxton/app/addons/pouchdb/base.js index df6c726..69962bb 100644 --- a/src/fauxton/app/addons/pouchdb/base.js +++ b/src/fauxton/app/addons/pouchdb/base.js @@ -1,3 +1,14 @@ +// 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 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// 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. /* * NOTE: * This temporarily uses the PouchDB map reduce implementation http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/app/templates/documents/duplicate_doc_modal.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/duplicate_doc_modal.html b/src/fauxton/app/templates/documents/duplicate_doc_modal.html index 3f374b6..dbb25bc 100644 --- a/src/fauxton/app/templates/documents/duplicate_doc_modal.html +++ b/src/fauxton/app/templates/documents/duplicate_doc_modal.html @@ -19,7 +19,7 @@ the License. </div> <div class="modal-body"> <div id="modal-error" class="hide alert alert-error"/> - <form id="file-upload" class="form" method="post"> + <form id="doc-duplicate" class="form" method="post"> <p class="help-block"> Set new documents ID: </p> http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/test/core/layoutSpec.js ---------------------------------------------------------------------- diff --git a/src/fauxton/test/core/layoutSpec.js b/src/fauxton/test/core/layoutSpec.js index 3876b70..4167100 100644 --- a/src/fauxton/test/core/layoutSpec.js +++ b/src/fauxton/test/core/layoutSpec.js @@ -10,7 +10,7 @@ // License for the specific language governing permissions and limitations under // the License. define([ - 'modules/fauxton/layout', + 'addons/fauxton/layout', 'testUtils' ], function (Layout, testUtils) { var assert = testUtils.assert; http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/test/core/navbarSpec.js ---------------------------------------------------------------------- diff --git a/src/fauxton/test/core/navbarSpec.js b/src/fauxton/test/core/navbarSpec.js index ec3e71f..3eca6f6 100644 --- a/src/fauxton/test/core/navbarSpec.js +++ b/src/fauxton/test/core/navbarSpec.js @@ -10,7 +10,7 @@ // License for the specific language governing permissions and limitations under // the License. define([ - 'modules/fauxton/base', + 'addons/fauxton/base', 'testUtils' ], function (Fauxton, testUtils) { var assert = testUtils.assert, http://git-wip-us.apache.org/repos/asf/couchdb/blob/86b6a144/src/fauxton/test/core/paginateSpec.js ---------------------------------------------------------------------- diff --git a/src/fauxton/test/core/paginateSpec.js b/src/fauxton/test/core/paginateSpec.js index 114c434..d05b322 100644 --- a/src/fauxton/test/core/paginateSpec.js +++ b/src/fauxton/test/core/paginateSpec.js @@ -11,8 +11,8 @@ // the License. define([ 'api', - 'modules/fauxton/components', - 'modules/documents/resources', + 'addons/fauxton/components', + 'addons/documents/resources', 'testUtils', 'app' ], function (FauxtonAPI, Views, Models, testUtils, app) {
