Skip to content

Commit

Permalink
Move openlayers to js/vendor
Browse files Browse the repository at this point in the history
Move js/openlayers to js/vendor/openlayers

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
  • Loading branch information
MauricioFauth committed Jun 14, 2017
1 parent 774150e commit 555156c
Show file tree
Hide file tree
Showing 400 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ imports:
- javascript
- php
filter:
excluded_paths: [js/vendor/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/sprintf.js]
excluded_paths: [js/vendor/*, js/jqplot/*, js/codemirror/*, js/sprintf.js]
build:
dependencies:
before:
Expand All @@ -12,7 +12,7 @@ build:
tests:
override:
-
command: './vendor/bin/phpcs --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/codemirror/*,*/openlayers/*,*/jqplot/*,*/build/*'
command: './vendor/bin/phpcs --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/codemirror/*,*/jqplot/*,*/build/*'
analysis:
file: 'cs-data' # The reporter filename
format: 'php-cs-checkstyle' # The supported format by Scrutinizer
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries" depends="phpcs-config">
<exec executable="phpcs">
<arg line="
--ignore=*/vendor/*,*/codemirror/*,*/openlayers/*,*/jqplot/*,*/build/*
--ignore=*/vendor/*,*/codemirror/*,*/jqplot/*,*/build/*
--report=checkstyle
--extensions=php
--report-file='${basedir}/build/logs/checkstyle.xml'
Expand Down
2 changes: 1 addition & 1 deletion doc/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ A list of files and corresponding functionality which degrade gracefully when re
* :file:`./setup/` (setup script)
* :file:`./examples/`
* :file:`./sql/` (SQL scripts to configure advanced functionality)
* :file:`./js/openlayers/` (GIS visualization)
* :file:`./js/vendor/openlayers/` (GIS visualization)

.. _faqconfig:

Expand Down
2 changes: 1 addition & 1 deletion js/gis_data_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function loadJSAndGISEditor(value, field, type, input_name) {
loadGISEditor(value, field, type, input_name);
}

script.src = 'js/openlayers/OpenLayers.js';
script.src = 'js/vendor/openlayers/OpenLayers.js';
head.appendChild(script);

gisEditorLoaded = true;
Expand Down
2 changes: 1 addition & 1 deletion js/tbl_gis_visualization.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function initGISVisualization() {
resizeGISVisualization();
if (typeof OpenLayers !== 'undefined') {
// Configure OpenLayers
OpenLayers._getScriptLocation = function() {return './js/openlayers/';};
OpenLayers._getScriptLocation = function() {return './js/vendor/openlayers/';};
// Adds necessary styles to the div that coontains the openStreetMap
styleOSM();
// Draws openStreetMap with openLayers
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit 555156c

Please sign in to comment.