Skip to content

[BROOKLYN-166] Replace existing textareas for editing YAML with Composer Tab + Codemirror #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 4 commits into from
Feb 8, 2016
Merged

[BROOKLYN-166] Replace existing textareas for editing YAML with Composer Tab + Codemirror #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4174bdb
Replace existing textareas for editing YAML with Composer Tab + Code…
m4rkmckenna Feb 2, 2016
72e1e28
Licence updates for codemirror
m4rkmckenna Feb 5, 2016
0a08f3b
Removing missed debug logging
m4rkmckenna Feb 5, 2016
67bc3eb
Removing missed debug logging
m4rkmckenna Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/build/optimize-js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
// Set to "none" to skip minification
optimize: "uglify"
})

70 changes: 60 additions & 10 deletions src/main/license/files/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,13 @@ This project includes the software: backbone.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)

This project includes the software: backbone.js
Available at: http://backbonejs.org
Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Version used: 1.1.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud (2010-2014)

This project includes the software: bootstrap.js
Available at: http://twitter.github.com/bootstrap/javascript.html#transitions
Version used: 2.0.4
Expand All @@ -222,6 +229,14 @@ This project includes the software: handlebars.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Yehuda Katz (2012)

This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
Developed by: Yehuda Katz (https://github.com/wycats/)
Inclusive of: handlebars*.js
Version used: 2.0.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (C) by Yehuda Katz (2011-2014)

This project includes the software: jQuery JavaScript Library
Available at: http://jquery.com/
Developed by: The jQuery Foundation (http://jquery.org/)
Expand All @@ -234,6 +249,18 @@ This project includes the software: jQuery JavaScript Library
Available at http://sizzlejs.com
Used under the MIT license

This project includes the software: jQuery JavaScript Library
Available at: http://jquery.com/
Developed by: The jQuery Foundation (http://jquery.org/)
Inclusive of: jquery.js
Version used: 1.8.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) jQuery Foundation and other contributors (2012)
Includes code fragments from sizzle.js:
Copyright (c) The Dojo Foundation
Available at http://sizzlejs.com
Used under the MIT license

This project includes the software: jQuery BBQ: Back Button & Query Library
Available at: http://benalman.com/projects/jquery-bbq-plugin/
Developed by: "Cowboy" Ben Alman (http://benalman.com/)
Expand Down Expand Up @@ -282,13 +309,6 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)

This project includes the software: marked.js
Available at: https://github.com/chjj/marked
Developed by: Christopher Jeffrey (https://github.com/chjj)
Version used: 0.3.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Christopher Jeffrey (2011-2014)

This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
Expand Down Expand Up @@ -330,12 +350,19 @@ This project includes the software: RequireJS (r.js maven plugin)
Arpad Borsos (2012)
Used under the BSD 2-Clause license.

This project includes the software: Swagger JS
Available at: https://github.com/swagger-api/swagger-js
Inclusive of: swagger.js
Version used: 2.1.6
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2015)

This project includes the software: Swagger UI
Available at: https://github.com/swagger-api/swagger-ui
Inclusive of: swagger*.{js,css,html}
Version used: 2.1.4
Inclusive of: swagger-ui.js
Version used: 2.1.3
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
Copyright (c) SmartBear Software (2015)

This project includes the software: underscore.js
Available at: http://underscorejs.org
Expand All @@ -345,6 +372,14 @@ This project includes the software: underscore.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)

This project includes the software: underscore.js
Available at: http://underscorejs.org
Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Inclusive of: underscore*.{js,map}
Version used: 1.7.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)

This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
Expand All @@ -353,6 +388,21 @@ This project includes the software: ZeroClipboard
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jon Rohan, James M. Greene (2014)

This project includes the software: marked.js
Available at: https://github.com/chjj/marked
Developed by: Christopher Jeffrey (https://github.com/chjj)
Inclusive of: marked.js
Version used: 0.3.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Christopher Jeffrey (2011-2014)

This project includes the software: CodeMirror
Available at: https://codemirror.net/
Developed by: CodeMirror (https://codemirror.net)
Inclusive of: codemirror*.{js,css}
Version used: 5.7.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Marijn Haverbeke (2015)

---------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions src/main/license/source-inclusions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
# extras file for org.heneveld.license-audit-maven-plugin
# listing projects from which *source* files are included

- id: jquery-core:1.7.2
- id: swagger-ui:2.1.4
# we use other versions of the above in other projs

- id: jquery-core
- id: swagger
- id: swagger-ui
- id: jquery.wiggle.min.js

@ahgittin ahgittin Feb 4, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this is an accidental reversion. the version numbers should be included. (you might want also to auto-regen the license file -- that also has some wanted new stuff removed but it's not a big deal.)

- id: require.js
- id: require.js/r.js
Expand All @@ -40,3 +39,4 @@
- id: js-yaml.js
- id: jquery.form.js
- id: marked.js
- id: codemirror.js

@ahgittin ahgittin Feb 4, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for LICENSE to generate correctly the detail for codemirror needs to be added to the extras file brooklyn-dist

we should tweak that generation to read from other projects. although that can wait, when we use bower we'll be rewriting it anyway.

13 changes: 12 additions & 1 deletion src/main/webapp/assets/css/brooklyn.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ BODY {
textarea {
white-space: pre;
word-wrap: normal;
overflow-x: scroll;
}

/* HEADER */
Expand Down Expand Up @@ -269,3 +268,15 @@ textarea {
content: 'Not Available';
*/
}

button.catalog-submit-button.btn {
margin-top: 10px;
}

.CodeMirror .cm-s-default {
height: 560px;
}

.CodeMirror .CodeMirror-placeholder {
color: #999;
}
Loading