-
-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix/clean-up-draw-widget-html-css
- Loading branch information
Showing
140 changed files
with
4,327 additions
and
1,884 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <!-- | ||
| If you’re filing a bug, please provide the following information: | ||
| --> | ||
|
|
||
| __How often can you reproduce it?__ <!-- Use [x] to mark your choice. --> | ||
|
|
||
| - [ ] Always | ||
| - [ ] Sometimes | ||
| - [ ] Rarely | ||
| - [ ] Unable | ||
| - [ ] I didn’t try | ||
|
|
||
| <!-- Please provide a detailed description of the issue. Include specific details to help us understand the problem. --> | ||
|
|
||
| __Description:__ | ||
|
|
||
|
|
||
|
|
||
| <!-- List the step-by-step process to reproduce the issue. --> | ||
|
|
||
| __Steps to reproduce:__ | ||
|
|
||
| 1. Include a JS Bin (or equivalent) link if possible. [You can use this as a starting point](http://jsbin.com/guresequba/edit?js,output) | ||
| 2. Detail the exact steps taken to produce the problem | ||
| 3. Include a gif if possible; you can use LICEcap to make a gif: http://www.cockos.com/licecap/ | ||
| 4. Check the browser console for errors (Use F12 to access the console) | ||
|
|
||
| <!-- Describe what you expected to have happen after completing the steps above. --> | ||
|
|
||
| __Expected results:__ | ||
|
|
||
|
|
||
|
|
||
| <!-- Describe what actually happened after completing the steps above. --> | ||
|
|
||
| __Actual results:__ | ||
|
|
||
|
|
||
|
|
||
| <!-- Include details about your environment. --> | ||
|
|
||
| __Environment:__ | ||
|
|
||
| | Software | Version | ||
| | ------------------ | ------- | ||
| | CMV Version | | ||
| | Browser | | ||
| | Operating system | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <!-- Thank you for contributing to cmv! Contributions are welcome and are | ||
| absolutely necessary for the project to stay relevent and useful. | ||
| Please fill out the details to ensure others can understand the | ||
| changes you are proposing and how they will benefit the project. --> | ||
|
|
||
| # Description | ||
| <!-- enter a description of the changes here --> | ||
|
|
||
| # Use case | ||
|
|
||
| ```javascript | ||
| // how the code can be used | ||
| ``` | ||
|
|
||
| # Checklist | ||
| <!-- please ensure your pull request passes the following check(s) --> | ||
|
|
||
| - [ ] `grunt lint` produces no error messages |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /** | ||
| * This file is referenced by the `dojoBuild` key in `package.json` and provides extra hinting specific to the Dojo | ||
| * build system about how certain files in the package need to be handled at build time. Build profiles for the | ||
| * application itself are stored in the `profiles` directory. | ||
| */ | ||
|
|
||
| var profile = (function () { | ||
| //only copy files matching these expressions | ||
| //this prevents them from being evaluated as amd modules | ||
| var reCopyOnly = [ | ||
| /Gruntfile/, | ||
| /package/, | ||
| /app\.js/ | ||
| ]; | ||
| //exclude from builds completely | ||
| var reMiniExclude = [ | ||
| /Gruntfile/, | ||
| /package/ | ||
| ]; | ||
| //non-amd modules | ||
| var reNonAmd = [ | ||
| /plugins\/Google/ | ||
| ]; | ||
| return { | ||
| // Resource tags are functions that provide hints to the build system about the way files should be processed. | ||
| // Each of these functions is called once for every file in the package directory. The first argument passed to | ||
| // the function is the filename of the file, and the second argument is the computed AMD module ID of the file. | ||
| resourceTags: { | ||
| // Files that contain test code and should be excluded when the `copyTests` build flag exists and is `false`. | ||
| // It is strongly recommended that the `mini` build flag be used instead of `copyTests`. Therefore, no files | ||
| // are marked with the `test` tag here. | ||
| test: function (filename, mid) { | ||
| return false; | ||
| }, | ||
|
|
||
| // Files that should be copied as-is without being modified by the build system. | ||
| // All files in the `app/resources` directory that are not CSS files are marked as copy-only, since these files | ||
| // are typically binaries (images, etc.) and may be corrupted by the build system if it attempts to process | ||
| // them and naively assumes they are scripts. | ||
| copyOnly: function (filename, mid) { | ||
| for (var i = 0; i < reCopyOnly.length; i++) { | ||
| if (reCopyOnly[i].test(filename)) { | ||
| return true; | ||
| } | ||
| } | ||
| return (/\/(images)\//.test(mid) && !/\.css$/.test(filename)) || | ||
| /\/node_modules\//.test(mid); | ||
| }, | ||
|
|
||
| // Files that are AMD modules. | ||
| // All JavaScript in this package should be AMD modules if you are starting a new project. If you are copying | ||
| // any legacy scripts from an existing project, those legacy scripts should not be given the `amd` tag. | ||
| amd: function (filename, mid) { | ||
| for (var i = 0; i < reNonAmd.length; i++) { | ||
| if (reNonAmd[i].test(filename)) { | ||
| return false; | ||
| } | ||
| } | ||
| return !this.copyOnly(filename, mid) && /\.js$/.test(filename); | ||
| }, | ||
|
|
||
| // Files that should not be copied when the `mini` build flag is set to true. | ||
| // In this case, we are excluding this package configuration file which is not necessary in a built copy of | ||
| // the application. | ||
| miniExclude: function (filename, mid) { | ||
| for (var i = 0; i < reMiniExclude.length; i++) { | ||
| if (reMiniExclude[i].test(filename)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
| }; | ||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,31 @@ | ||
| { | ||
| "name": "ConfigurableMapViewerCMV", | ||
| "version": "1.4.0", | ||
| "version": "2.0.0-beta.1", | ||
| "author": "cmv.io - https://github.com/cmv/", | ||
| "license": "MIT", | ||
| "year": "2016", | ||
| "homepage": "http://cmv.io/", | ||
| "year": "2017", | ||
| "homepage": "https://cmv.io/", | ||
| "repository": "https://github.com/cmv/cmv-app/", | ||
| "dependencies": { | ||
| "babel-eslint": "6.0.x", | ||
| "csslint": "0.10.x", | ||
| "eslint": "2.5.x", | ||
| "grunt": "0.4.x", | ||
| "grunt-postcss": "0.8.x", | ||
| "babel-eslint": "~7.1.1", | ||
| "csslint": "1.0.x", | ||
| "eslint": "~3.17.0", | ||
| "grunt": "1.0.x", | ||
| "grunt-contrib-clean": "1.0.x", | ||
| "grunt-contrib-compress": "~1.4.1", | ||
| "grunt-contrib-connect": "1.0.x", | ||
| "grunt-contrib-copy": "1.0.x", | ||
| "grunt-contrib-csslint": "1.0.x", | ||
| "grunt-contrib-cssmin": "1.0.x", | ||
| "grunt-eslint": "18.0.x", | ||
| "grunt-contrib-uglify": "1.0.x", | ||
| "grunt-contrib-csslint": "~2.0.x", | ||
| "grunt-contrib-cssmin": "~2.0.0", | ||
| "grunt-contrib-uglify": "~2.2.0", | ||
| "grunt-contrib-watch": "1.0.x", | ||
| "grunt-newer": "1.1.x", | ||
| "grunt-eslint": "19.0.x", | ||
| "grunt-newer": "1.2.x", | ||
| "grunt-open": "0.2.x", | ||
| "grunt-contrib-compress": "1.2.x", | ||
| "grunt-postcss": "0.8.x", | ||
| "body-parser": "~1.17.0", | ||
| "proxypage": "*" | ||
| }, | ||
| "engine": "node >= 4" | ||
| } | ||
| "engine": "node >= 4", | ||
| "dojoBuild": "package.js" | ||
| } |
Binary file not shown.
Oops, something went wrong.