You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by robertkowalski <gi...@git.apache.org> on 2015/02/13 16:45:41 UTC
[GitHub] couchdb-fauxton pull request: [WIP] Two pane editor
GitHub user robertkowalski opened a pull request:
https://github.com/apache/couchdb-fauxton/pull/268
[WIP] Two pane editor
- introduce a editor on the left which changes a resultview on
the right
- delete old unused templates: design_doc_selector.html,
view_editor.html
- introduce styled dropdowns with no round corners
- allow breadcrumbs without mouseover effects
- populateDatabase handler now accepts a doc count and creates a
stubview
Based on a concept and design from Sean Barclay
Watermark by Jenn Schiffer and Sue Lockwood
Closes #33
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/robertkowalski/couchdb-fauxton two-pane
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/couchdb-fauxton/pull/268.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #268
----
commit 88d3b0798b4df0e2f87c240234382d474f277188
Author: Robert Kowalski <ro...@apache.org>
Date: 2015-01-29T16:04:52Z
Two pane editor
- introduce a editor on the left which changes a resultview on
the right
- delete old unused templates: design_doc_selector.html,
view_editor.html
- introduce styled dropdowns with no round corners
- allow breadcrumbs without mouseover effects
- populateDatabase handler now accepts a doc count and creates a
stubview
Based on a concept and design from Sean Barclay
Watermark by Jenn Schiffer and Sue Lockwood
Closes #33
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750727
--- Diff: app/addons/documents/index-editor/components.react.jsx ---
@@ -24,19 +24,21 @@ function(app, FauxtonAPI, React, Stores, Actions, Components, beautifyHelper) {
var indexEditorStore = Stores.indexEditorStore;
var getDocUrl = app.helpers.getDocUrl;
- var ToggleButton = React.createClass({
--- End diff --
the togglebutton got superfluous as editor is always visible
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750664
--- Diff: app/addons/documents/index-editor/actions.js ---
@@ -39,11 +39,6 @@ function (app, FauxtonAPI, Documents, ActionTypes) {
return {
//helpers are added here for use in testing actions
helpers: ActionHelpers,
- toggleEditor: function () {
--- End diff --
the editor is now always visible
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750877
--- Diff: app/addons/fauxton/components.js ---
@@ -67,11 +67,6 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
this.breadcrumbs.unselectLastBreadcrumb();
},
- updateDropdown: function(menuLinks){
- this.dropdownMenuLinks = menuLinks;
- this.dropdown && this.dropdown.update(menuLinks);
- },
-
--- End diff --
dead code removal
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: [WIP] Two pane editor
Posted by seanbarclay <gi...@git.apache.org>.
Github user seanbarclay commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74360964
Hey @robertkowalski.
1. Let's either make all select menus custom or native. I would say make them all custom. Therefore, let's make menu's like custom map reduce custom as well vs. native.
2. Please use the "down-dir" icon for the drop-down select.
3. background-color: e6e6e6 border: b3b3b3
4. Check out this screenshot: https://www.dropbox.com/s/3nkt058xlqr4q5b/Screenshot%202015-02-13%2011.11.23.png?dl=0
Thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74864461
+1 once travis is green. Nice work.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750771
--- Diff: app/addons/documents/routes-documents.js ---
@@ -36,39 +36,20 @@ function(app, FauxtonAPI, BaseRoute, Documents, Changes, Index, DocEditor, Datab
route: "allDocs",
roles: ["fx_loggedIn"]
},
- "database/:database/_design/:ddoc/_view/:view": {
- route: "viewFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_lists/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_filters/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_show/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
--- End diff --
these are unused stubs
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24805595
--- Diff: app/addons/documents/index-editor/components.react.jsx ---
@@ -24,19 +24,21 @@ function(app, FauxtonAPI, React, Stores, Actions, Components, beautifyHelper) {
var indexEditorStore = Stores.indexEditorStore;
var getDocUrl = app.helpers.getDocUrl;
- var ToggleButton = React.createClass({
-
- render: function() {
+ // global component
+ var StyledSelect = React.createClass({
--- End diff --
Nice, are you going to move this somewhere more general so we can is it elsewhere?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750765
--- Diff: app/addons/documents/index-results/index-results.components.react.jsx ---
@@ -0,0 +1,52 @@
+// 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.
+
+define([
+ 'app',
+ 'api',
+ 'react'
+],
+
+function (app, FauxtonAPI, React) {
+
+ var NoResultScreen = React.createClass({
+ render: function () {
+ return (
+ <div className="watermark-logo">
+ <h3>No Index Created Yet!</h3>
+ </div>
+ );
+ }
+ });
+
+ var ViewResultListController = React.createClass({
+ render: function () {
+ var view = <NoResultScreen />;
--- End diff --
in a next step we can add a react based docuemnt list here in case we got results
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24751084
--- Diff: app/addons/documents/routes-index-editor.js ---
@@ -0,0 +1,155 @@
+// 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.
+
+define([
+ 'app',
+ 'api',
+
+ // Modules
+ 'addons/documents/shared-routes',
+ 'addons/documents/views',
+ 'addons/documents/views-index',
+ 'addons/databases/base',
+ 'addons/fauxton/components'
+
+],
+
+function (app, FauxtonAPI, BaseRoute, Documents, Index, Databases, Components) {
+
+
+ var IndexEditorAndResults = BaseRoute.extend({
+ layout: 'two_pane',
+ routes: {
+ 'database/:database/new_view': 'newViewEditor',
+ 'database/:database/new_view/:designDoc': 'newViewEditor',
+ 'database/:database/_design/:ddoc/_view/:view': {
+ route: 'viewFn',
+ roles: ['fx_loggedIn']
+ }
+ },
--- End diff --
most of it is copy pasted from routes.js - main difference is the usage of breadcrumbs and omitted header components
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74645553
If I set reduce true in the query options. Then change something in the view and click save and build. The query options are ignored.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74646337
@robertkowalski this is looking great. Just some small bugs to fix.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24751010
--- Diff: test/nightwatch_tests/custom-commands/populateDatabase.js ---
@@ -9,25 +9,40 @@ function PopulateDatabase () {
util.inherits(PopulateDatabase, events.EventEmitter);
-PopulateDatabase.prototype.command = function (databaseName) {
+PopulateDatabase.prototype.command = function (databaseName, count) {
var that = this,
nano = helpers.getNanoInstance(),
database = nano.use(databaseName),
i = 0;
async.whilst(
- function () { return i < 20; },
+ function () { return i < (count ? count : 20); },
--- End diff --
make count of created documents configurable
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24805472
--- Diff: app/addons/databases/tests/nightwatch/createsView.js ---
@@ -1,65 +0,0 @@
-// 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.
-
-module.exports = {
--- End diff --
Have you written another nightwatch test or are you removing this and instead relying on the mocha tests?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski closed the pull request at:
https://github.com/apache/couchdb-fauxton/pull/268
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750844
--- Diff: app/addons/documents/templates/design_doc_selector.html ---
@@ -1,36 +0,0 @@
-<!--
--- End diff --
these are unused remainders
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750997
--- Diff: test/nightwatch_tests/custom-commands/populateDatabase.js ---
@@ -9,25 +9,40 @@ function PopulateDatabase () {
util.inherits(PopulateDatabase, events.EventEmitter);
-PopulateDatabase.prototype.command = function (databaseName) {
+PopulateDatabase.prototype.command = function (databaseName, count) {
var that = this,
nano = helpers.getNanoInstance(),
database = nano.use(databaseName),
i = 0;
async.whilst(
- function () { return i < 20; },
+ function () { return i < (count ? count : 20); },
function (cb) {
- i++;
- var document_id = 'document_'+ i;
- database.insert({ number: i }, document_id, cb);
+ i++;
+ var document_id = 'document_'+ i;
+ database.insert({ number: i }, document_id, cb);
},
function (err) {
if (err) {
console.log('Error in nano populateDatabase Function: ' +
- document_id + ', in database: ' + databaseName, err.message);
+ ' in database: ' + databaseName, err.message);
}
- that.emit('complete');
+
+ database.insert({
+ views: {
+ "stubview": {
+ "map": "function(doc) {\n emit(doc._id, 'stub');\n}"
+ }
+ }
+ },
--- End diff --
add a default stubview
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74644869
Small issue. A view with `_sum` as the reduce still shows the custom reduce:
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by garrensmith <gi...@git.apache.org>.
Github user garrensmith commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74833001
@robertkowalski this is looking good. Just one bug. If I edit a map function, then save. Then click the '<' to go back to the all docs page I get the confirm modal that tells me I have unsaved changes even though I do not.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750643
--- Diff: app/addons/documents/assets/less/viewEditor.less ---
@@ -10,76 +10,223 @@
// License for the specific language governing permissions and limitations under
// the License.
-@import "../../../../../assets/less/animations.less";
@import "../../../../../assets/less/variables.less";
-.keyframes(fadeInDownNoReduce, {
- opacity: 0;
- height: 0px;
-},
-{
- opacity: 1;
- height: 546px;
-});
-
-
-.keyframes(fadeInDownReduce, {
- opacity: 0;
- height: 0px;
-},
-{
- opacity: 1;
- height: 745px;
-});
-
-.keyframes(fadeOutUpReduce, {
- opacity: 1;
- height: 745px;
-},
-{
- opacity: 0;
- height: 0px;
-});
-
-.keyframes(fadeOutUpNoReduce, {
- opacity: 1;
- height: 546px;
-},
-{
- opacity: 0;
- height: 0px;
-});
-
-
-.fadeInDownNoReduce-enter {
- .animation(fadeInDownNoReduce 1s both);
-}
+.editor-wrapper {
-.fadeInDownNoReduce-leave {
- .animation(fadeOutUpNoReduce 1s both);
-}
-.fadeInDownReduce-enter {
- .animation(fadeInDownReduce 1s both);
-}
+ .define-view {
+ padding-bottom: 70px;
+ }
+
+ .define-view {
+ .help-link {
+ margin-left: 3px;
+ }
+ }
+ label {
+ font-size: 16px;
+ }
+ .bordered-box {
+ border-bottom: 1px solid #ccc;
+ }
+ .padded-box {
+ margin: 25px 30px;
+ }
+ .db-title {
+ color: @brandPrimary;
+ line-height: 30px;
+ }
+ .new-ddoc-input {
+ margin-top: 25px;
+ }
-.fadeInDownReduce-leave {
- .animation(fadeOutUpReduce 1s both);
+ .styled-select {
+ width: 250px;
+ }
+ .styled-select label {
+ margin: 0;
+ }
+ .styled-select select {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ background-color: #e6e6e6;
+ border: 1px solid #b3b3b3;
+ height: 45px;
+ width: 250px;
+ }
+ .styled-select select:-moz-focusring {
+ color: transparent;
+ text-shadow: 0 0 0 #000;
+ }
+ .styled-select select::-ms-expand {
+ display: none;
+ }
+ .styled-select i {
+ position: absolute;
+ right: 10px;
+ top: 12px;
+ pointer-events: none;
+ }
}
-#dashboard-upper-content{
- .editor-wrapper {
- padding-bottom: 70px;
+// 940px grid without margin
+// -------------------------
+@gridColumnWidthNoMargin: 60px;
--- End diff --
i had to create my own grid as bootstrap 2 grids have 20px margin but i need full-sized borders on the left size - but still want to take adavantage of `span5` and `span7`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750934
--- Diff: app/addons/fauxton/components.js ---
@@ -139,17 +134,24 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
};
return {
+ toggleDisabled: this.toggleDisabled,
crumbs: crumbs,
nextCrumbHasLabel: nextCrumbHasLabel
};
},
toggleLastElement: function (event) {
+ if (this.toggleDisabled) {
+ return;
+ }
--- End diff --
click-events + mouseover events where hardwired into the breadcrumb component, had to make it configurable for using it as simple breadcrumb
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750553
--- Diff: app/addons/documents/assets/less/viewEditor.less ---
@@ -10,76 +10,223 @@
// License for the specific language governing permissions and limitations under
// the License.
-@import "../../../../../assets/less/animations.less";
@import "../../../../../assets/less/variables.less";
-.keyframes(fadeInDownNoReduce, {
--- End diff --
the editor is now always visible, the tabbing got removed
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24806442
--- Diff: app/addons/databases/tests/nightwatch/createsView.js ---
@@ -1,65 +0,0 @@
-// 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.
-
-module.exports = {
--- End diff --
yes, app/addons/documents/tests/nightwatch/viewCreate.js replaces this test with 3
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750987
--- Diff: test/nightwatch_tests/custom-commands/populateDatabase.js ---
@@ -9,25 +9,40 @@ function PopulateDatabase () {
util.inherits(PopulateDatabase, events.EventEmitter);
-PopulateDatabase.prototype.command = function (databaseName) {
+PopulateDatabase.prototype.command = function (databaseName, count) {
var that = this,
nano = helpers.getNanoInstance(),
database = nano.use(databaseName),
i = 0;
async.whilst(
- function () { return i < 20; },
+ function () { return i < (count ? count : 20); },
function (cb) {
- i++;
- var document_id = 'document_'+ i;
- database.insert({ number: i }, document_id, cb);
+ i++;
+ var document_id = 'document_'+ i;
+ database.insert({ number: i }, document_id, cb);
},
function (err) {
if (err) {
console.log('Error in nano populateDatabase Function: ' +
- document_id + ', in database: ' + databaseName, err.message);
--- End diff --
as `document_id ` is not in this scope it threw an error in case of an error not displaying the error message
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750576
--- Diff: app/addons/documents/assets/less/viewEditor.less ---
@@ -10,76 +10,223 @@
// License for the specific language governing permissions and limitations under
// the License.
-@import "../../../../../assets/less/animations.less";
@import "../../../../../assets/less/variables.less";
-.keyframes(fadeInDownNoReduce, {
- opacity: 0;
- height: 0px;
-},
-{
- opacity: 1;
- height: 546px;
-});
-
-
-.keyframes(fadeInDownReduce, {
- opacity: 0;
- height: 0px;
-},
-{
- opacity: 1;
- height: 745px;
-});
-
-.keyframes(fadeOutUpReduce, {
- opacity: 1;
- height: 745px;
-},
-{
- opacity: 0;
- height: 0px;
-});
-
-.keyframes(fadeOutUpNoReduce, {
- opacity: 1;
- height: 546px;
-},
-{
- opacity: 0;
- height: 0px;
-});
-
-
-.fadeInDownNoReduce-enter {
- .animation(fadeInDownNoReduce 1s both);
-}
+.editor-wrapper {
-.fadeInDownNoReduce-leave {
- .animation(fadeOutUpNoReduce 1s both);
-}
-.fadeInDownReduce-enter {
- .animation(fadeInDownReduce 1s both);
-}
+ .define-view {
+ padding-bottom: 70px;
+ }
+
+ .define-view {
+ .help-link {
+ margin-left: 3px;
+ }
+ }
+ label {
+ font-size: 16px;
+ }
+ .bordered-box {
+ border-bottom: 1px solid #ccc;
+ }
+ .padded-box {
+ margin: 25px 30px;
+ }
+ .db-title {
+ color: @brandPrimary;
+ line-height: 30px;
+ }
+ .new-ddoc-input {
+ margin-top: 25px;
+ }
-.fadeInDownReduce-leave {
- .animation(fadeOutUpReduce 1s both);
+ .styled-select {
--- End diff --
begin of styling for the styled-select component.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750816
--- Diff: app/addons/documents/routes-documents.js ---
@@ -36,39 +36,20 @@ function(app, FauxtonAPI, BaseRoute, Documents, Changes, Index, DocEditor, Datab
route: "allDocs",
roles: ["fx_loggedIn"]
},
- "database/:database/_design/:ddoc/_view/:view": {
- route: "viewFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_lists/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_filters/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
- "database/:database/_design/:ddoc/_show/:fn": {
- route: "tempFn",
- roles: ['fx_loggedIn']
- },
"database/:database/_design/:ddoc/metadata": {
route: "designDocMetadata",
roles: ['fx_loggedIn']
},
- "database/:database/new_view": "newViewEditor",
- "database/:database/new_view/:designDoc": "newViewEditor",
"database/:database/_changes(:params)": "changes"
},
events: {
- "route:updateAllDocs": "updateAllDocsFromView",
"route:reloadDesignDocs": "reloadDesignDocs",
- "route:paginate": "paginate",
- "route:perPageChange": "perPageChange",
"route:changesFilterAdd": "addFilter",
"route:changesFilterRemove": "removeFilter",
- "route:updateQueryOptions": "updateQueryOptions"
+ 'route:updateAllDocs': 'updateAllDocsFromView',
+ 'route:paginate': 'paginate',
+ 'route:perPageChange': 'perPageChange',
--- End diff --
it turns out even if you inherit from a baseclass you will need to define your routes in every child, probably backbone inheritance does not do a deep copy
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24750846
--- Diff: app/addons/documents/templates/view_editor.html ---
@@ -1,86 +0,0 @@
-<!--
--- End diff --
these are unused remainders
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#discussion_r24806789
--- Diff: app/addons/documents/index-editor/components.react.jsx ---
@@ -24,19 +24,21 @@ function(app, FauxtonAPI, React, Stores, Actions, Components, beautifyHelper) {
var indexEditorStore = Stores.indexEditorStore;
var getDocUrl = app.helpers.getDocUrl;
- var ToggleButton = React.createClass({
-
- render: function() {
+ // global component
+ var StyledSelect = React.createClass({
--- End diff --
Yes, I want to tackle that immediatly after this one got merged, as I have at least one other component for that from older work: https://github.com/apache/couchdb-fauxton/blob/master/app/addons/documents/header/header.react.jsx#L27
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-fauxton pull request: [WIP] Two pane editor
Posted by robertkowalski <gi...@git.apache.org>.
Github user robertkowalski commented on the pull request:
https://github.com/apache/couchdb-fauxton/pull/268#issuecomment-74273851
@seanbarclay can you take a look, especially the custom dropdowns need color-codes. btw it just works for IE > 10. Maybe that's bad?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---