Merge pull request #38 from preserveddarnell/newcopyedits
Update various typos, punctuations & errors.
This commit is contained in:
Thomas Zarebczan
GitHub
commit
9246952c08
5 changed files with 371 additions and 372 deletions
5
LICENSE
5
LICENSE
|
|
@ -1,10 +1,9 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2017-2018 LBRY Inc
|
||||
Copyright (c) 2017-2018 LBRY Inc.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ composer update
|
|||
* Create the directories, `tmp` and `logs` in the `block-explorer` folder if they have not been created yet, and make sure that they are writable by the web server.
|
||||
* Copy `config/app.default.php` to `config/app.php`. Edit the database connection values to correspond to your environment.
|
||||
* Copy `config/lbry.default.php` to `config/lbry.php`. Update the values for LBRY RPC URL and the Redis URL to correspond to your environment.
|
||||
* Configure your web server with the host root folder set to `<path to>/block-explorer/webroot` where `<path to>` is the absolute path to the configuraiton. Here is a sample nginx configuration. You can make changes to this configuration to correspond to your environment.
|
||||
* Configure your web server with the host root folder set to `<path to>/block-explorer/webroot` where `<path to>` is the absolute path to the configuration. Here is a sample nginx configuration. You can make changes to this configuration to correspond to your environment.
|
||||
```
|
||||
server {
|
||||
listen 80;
|
||||
|
|
@ -68,7 +68,7 @@ Create claims found on the LBRY blockchain in the database. This requires the Py
|
|||
Get the current LBC price in USD and store the value in the `PriceHistory` table. This also caches the most recent price in Redis.
|
||||
|
||||
#### forever.sh
|
||||
Run the `forevermempool` script, and restart if necessary. The `forevermempool` script checks the LBRY blockchain mempool every second and creates transactions found in the database. The script makes use of Redis for caching the pending transation IDs.
|
||||
Run the `forevermempool` script, and restart if necessary. The `forevermempool` script checks the LBRY blockchain mempool every second and creates transactions found in the database. The script makes use of Redis for caching the pending transaction IDs.
|
||||
|
||||
|
||||
## Usage
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Version: 1.1.2
|
|||
|
||||
## Description
|
||||
|
||||
Smoothly animates the `dataProvider`
|
||||
Smoothly animates the `dataProvider`.
|
||||
|
||||
It works with serial, pie, XY, funnel, and radar.
|
||||
|
||||
|
|
@ -96,13 +96,13 @@ http://www.apache.org/licenses/LICENSE-2.0
|
|||
## Changelog
|
||||
|
||||
### 1.1.2
|
||||
* Fixing a bug with the minimum/maximum
|
||||
* Fixing a bug with the minimum/maximum.
|
||||
|
||||
### 1.1.1
|
||||
* It now automatically sets the minimum/maximum on the value axes while animating
|
||||
* It now automatically sets the minimum/maximum on the value axes while animating.
|
||||
|
||||
### 1.1.0
|
||||
* Adding in support for XY charts
|
||||
* Adding in support for XY charts.
|
||||
|
||||
### 1.0.0
|
||||
* Initial release
|
||||
* Initial release.
|
||||
|
|
|
|||
|
|
@ -5,28 +5,28 @@ Version: 1.0.16
|
|||
|
||||
## Description
|
||||
|
||||
By default all amCharts libraries accept data in JSON format. It needs to be
|
||||
By default, all amCharts libraries accept data in JSON format. It needs to be
|
||||
there when the web page loads, defined in-line or loaded via custom code.
|
||||
|
||||
This plugin introduces are native wrapper that enables automatic loading of data
|
||||
from external data data sources in CSV and JSON formats.
|
||||
This plugin introduces our native wrapper that enables automatic loading of data
|
||||
from external data sources in CSV and JSON formats.
|
||||
|
||||
Most of the times you will just need to provide a URL of the external data
|
||||
Most of the time, you will just need to provide a URL of the external data
|
||||
source - static file or dynamically generated - and it will do the rest.
|
||||
|
||||
|
||||
## Important notice
|
||||
|
||||
Due to security measures implemented in most of the browsers, the external data
|
||||
loader will work only when the page with the chart or map is loaded via web
|
||||
Due to security measures implemented in most of the browsers, the external data
|
||||
loader will work only when the page with the chart or map is loaded via web
|
||||
server.
|
||||
|
||||
So, any of the examples loaded locally (file:///) will not work.
|
||||
|
||||
The page needs to be loaded via web server (http://) in order to work properly.
|
||||
|
||||
Loading data from another domain than the web page is loaded is possible but is
|
||||
a subject for `Access-Control-Allow-Origin` policies defined by the web server
|
||||
Loading data from another domain than the web page is loaded is possible, but is
|
||||
a subject for `Access-Control-Allow-Origin` policies defined by the web server
|
||||
you are loading data from.
|
||||
|
||||
For more about loading data across domains use the following thread:
|
||||
|
|
@ -75,10 +75,10 @@ AmCharts.makeChart( "chartdiv", {
|
|||
} );
|
||||
```
|
||||
|
||||
That's it. The plugin will make sure the files are loaded and dataProvider is
|
||||
That's it. The plugin will make sure the files are loaded and dataProvider is
|
||||
populated with their content *before* the chart is built.
|
||||
|
||||
Some formats, like CSV, will require additional parameters needed to parse the
|
||||
Some formats like CSV, will require additional parameters needed to parse the
|
||||
data, such as "separator".
|
||||
|
||||
If the "format" is omitted, the plugin will assume JSON.
|
||||
|
|
@ -104,33 +104,33 @@ chart["dataLoader"] = {
|
|||
|
||||
Property | Default | Description
|
||||
-------- | ------- | -----------
|
||||
async | true | If set to false (not recommended) everything will wait until data is fully loaded
|
||||
complete | | Callback function to execute when loader is done
|
||||
delimiter | , | [CSV only] a delimiter for columns (use \t for tab delimiters)
|
||||
emptyAs | undefined | [CSV only] replace empty columns with whatever is set here
|
||||
error | | Callback function to execute if file load fails
|
||||
init | | Callback function to execute when Data Loader is initialized, before any loading starts
|
||||
format | json | Type of data: json, csv
|
||||
headers | | An array of objects with two properties (key and value) to attach to HTTP request
|
||||
load | | Callback function to execute when file is successfully loaded (might be invoked multiple times)
|
||||
noStyles | false | If set to true no styles will be applied to "Data loading" curtain
|
||||
numberFields | | [CSV only] An array of fields in data to treat as numbers
|
||||
postProcess | | If set to function reference, that function will be called to "post-process" loaded data before passing it on to chart. The handler function will receive two parameters: loaded data, Data Loader options
|
||||
async | true | If set to false (not recommended), everything will wait until data is fully loaded.
|
||||
complete | | Callback function to execute when loader is done.
|
||||
delimiter | , | [CSV only] a delimiter for columns (use \t for tab delimiters).
|
||||
emptyAs | undefined | [CSV only] replace empty columns with whatever is set here.
|
||||
error | | Callback function to execute if file load fails.
|
||||
init | | Callback function to execute when Data Loader is initialized, before any loading starts.
|
||||
format | json | Type of data: json, csv.
|
||||
headers | | An array of objects with two properties (key and value) to attach to HTTP request.
|
||||
load | | Callback function to execute when file is successfully loaded (might be invoked multiple times).
|
||||
noStyles | false | If set to true, no styles will be applied to "Data loading" curtain.
|
||||
numberFields | | [CSV only] An array of fields in data to treat as numbers.
|
||||
postProcess | | If set to function reference, that function will be called to "post-process" loaded data before passing it on to chart. The handler function will receive two parameters: loaded data, Data Loader options.
|
||||
progress | | Set this to function reference to track progress of the load. The function will be passed in three parameters: global progress, individual file progress, file URL.
|
||||
showErrors | true | Show loading errors in a chart curtain
|
||||
showCurtain | true| Show curtain over the chart area when loading data
|
||||
reload | 0 | Reload data every X seconds
|
||||
reverse | false | [CSV only] add data points in revers order
|
||||
skip | 0 | [CSV only] skip X first rows in data (includes first row if useColumnNames is used)
|
||||
skipEmpty | true | [CSV only] Ignore empty lines in data
|
||||
timestamp | false | Add current timestamp to data URLs (to avoid caching)
|
||||
useColumnNames | false | [CSV only] Use first row in data as column names when parsing
|
||||
showErrors | true | Show loading errors in a chart curtain.
|
||||
showCurtain | true| Show curtain over the chart area when loading data.
|
||||
reload | 0 | Reload data every X seconds.
|
||||
reverse | false | [CSV only] add data points in revers order.
|
||||
skip | 0 | [CSV only] skip X first rows in data (includes first row if useColumnNames is used).
|
||||
skipEmpty | true | [CSV only] Ignore empty lines in data.
|
||||
timestamp | false | Add current timestamp to data URLs (to avoid caching).
|
||||
useColumnNames | false | [CSV only] Use first row in data as column names when parsing.
|
||||
|
||||
|
||||
## Using in JavaScript Stock Chart
|
||||
|
||||
In JavaScript Stock Chart it works exactly the same as in other chart types,
|
||||
with the exception that `dataLoader` is set as a property to the data set
|
||||
In JavaScript Stock Chart, it works exactly the same as in other chart types,
|
||||
with the exception that `dataLoader` is set as a property to the data set
|
||||
definition. I.e.:
|
||||
|
||||
```
|
||||
|
|
@ -174,7 +174,7 @@ var chart = AmCharts.makeChart("chartdiv", {
|
|||
|
||||
### Can I also load event data the same way?
|
||||
|
||||
Sure. You just add a `eventDataLoader` object to your data set. All the same
|
||||
Sure. You just add a `eventDataLoader` object to your data set. All the same
|
||||
settings apply.
|
||||
|
||||
|
||||
|
|
@ -251,9 +251,9 @@ The three available functions are as follows:
|
|||
|
||||
Function | Parameters | Description
|
||||
-------- | ---------- | -----------
|
||||
AmCharts.loadFile() | url, options, callback | Loads the file and passes it into callback function (unparsed)
|
||||
AmCharts.parseCSV() | data, options | Parses data in string CSV format and returns JavaScript Array
|
||||
AmCharts.parseJSON() | data | Parses data in string JSON format and returns JavaScript Array
|
||||
AmCharts.loadFile() | url, options, callback | Loads the file and passes it into callback function (unparsed).
|
||||
AmCharts.parseCSV() | data, options | Parses data in string CSV format and returns JavaScript Array.
|
||||
AmCharts.parseJSON() | data | Parses data in string JSON format and returns JavaScript Array.
|
||||
|
||||
The options passed into standalone functions are the same as discussed in [Complete list of available dataLoader settings](#complete-list-of-available-dataloader-settings) chapter.
|
||||
|
||||
|
|
@ -280,16 +280,16 @@ AmCharts.loadFile(dataset_url, {}, function(data) {
|
|||
|
||||
## Translating into other languages
|
||||
|
||||
Depending on configuration options the plugin will display a small number of
|
||||
Depending on configuration options, the plugin will display a small number of
|
||||
text prompts, like 'Data loading...'.
|
||||
|
||||
Plugin will try matching chart's `language` property and display text prompts in
|
||||
Plugin will try matching chart's `language` property and display text prompts in
|
||||
a corresponding language. For that the plugin needs to have the translations.
|
||||
|
||||
Some of the plugin translations are in **lang** subdirectory. Simply include the
|
||||
Some of the plugin translations are in **lang** subdirectory. Simply include the
|
||||
one you need.
|
||||
|
||||
If there is no translation to your language readily available, just grab en.js,
|
||||
If there is no translation to your language readily available, just grab en.js,
|
||||
copy it and translate.
|
||||
|
||||
The structure is simple:
|
||||
|
|
@ -302,7 +302,7 @@ The phrase in English must be left intact.
|
|||
|
||||
When you're done, you can include your language as a JavaScript file.
|
||||
|
||||
P.S. send us your translation so we can include it for the benefits of other
|
||||
P.S. send us your translation so we can include it for the benefits of other
|
||||
users. Thanks!
|
||||
|
||||
|
||||
|
|
@ -354,72 +354,72 @@ http://www.apache.org/licenses/LICENSE-2.0
|
|||
## Changelog
|
||||
|
||||
### 1.0.16
|
||||
* Added "numberFields" config array
|
||||
* Added "numberFields" config array.
|
||||
|
||||
### 1.0.15
|
||||
* Added "emptyAs" config property. Empty CSV values will be set to this (default `undefined`)
|
||||
* Added "emptyAs" config property. Empty CSV values will be set to this (default `undefined`).
|
||||
|
||||
### 1.0.14
|
||||
* Added "init" event handler, which is called **before** loading starts
|
||||
* Added "init" event handler, which is called **before** loading starts.
|
||||
|
||||
### 1.0.13
|
||||
* Added "progress" handler, which can be used to monitor data load progress
|
||||
* Added "progress" handler, which can be used to monitor data load progress.
|
||||
|
||||
### 1.0.12
|
||||
* Better default options handling in external calls to AmCharts.loadFile
|
||||
* Fixed the latest version of Stock Chart not resetting to default pre-defined period
|
||||
* New example: Using Data Loader functions externally (map_json_external_function.html)
|
||||
* Better default options handling in external calls to AmCharts.loadFile.
|
||||
* Fixed the latest version of Stock Chart not resetting to default pre-defined period.
|
||||
* New example: Using Data Loader functions externally (map_json_external_function.html).
|
||||
|
||||
### 1.0.11
|
||||
* New translation: Added French translation. Thanks Remy!
|
||||
* Tweaks to allow better animation after data load on Pie chart
|
||||
* Tweaks to allow better animation after data load on Pie chart.
|
||||
|
||||
### 1.0.10
|
||||
* Fixed error related to headers not being set when using standalone data load functions
|
||||
* Fixed error related to headers not being set when using standalone data load functions.
|
||||
|
||||
### 1.0.9
|
||||
* Plugin will now ignore empty CSV lines by default (configurable with `skipEmpty` property)
|
||||
* Plugin will now ignore empty CSV lines by default (configurable with `skipEmpty` property).
|
||||
|
||||
### 1.0.8
|
||||
* Added `headers` config variable which allows adding custom headers to HTTP requests
|
||||
* Added `headers` config variable which allows adding custom headers to HTTP requests.
|
||||
|
||||
### 1.0.7
|
||||
* Fixed an issue with the Pie chart when it is being loaded in inactive tab
|
||||
* Fixed an issue with the Pie chart when it is being loaded in inactive tab.
|
||||
|
||||
### 1.0.6
|
||||
* Added support for Gauge chart (loads `arrows` array)
|
||||
* Added support for Gauge chart (loads `arrows` array).
|
||||
|
||||
### 1.0.5
|
||||
* Fixed JS error if periodSelector was not defined in chart config
|
||||
* Now all callback functions (complete, error, load) receive additional parameter: chart
|
||||
* postProcess function will now have "this" context set to Data Loader object as well as receive chart reference as third paramater
|
||||
* Fixed JS error if periodSelector was not defined in chart config.
|
||||
* Now all callback functions (complete, error, load) receive additional parameter: chart.
|
||||
* postProcess function will now have "this" context set to Data Loader object as well as receive chart reference as third parameter.
|
||||
|
||||
### 1.0.4
|
||||
* Added `chart.dataLoader.loadData()` function which can be used to manually trigger all data reload
|
||||
* Added `chart.dataLoader.loadData()` function which can be used to manually trigger all data reload.
|
||||
|
||||
### 1.0.3
|
||||
* Fixed the bug where defaults were not being applied properly
|
||||
* Fixed the bug with translations not being applied properly
|
||||
* Cleaned up the code (to pass JSHint validation)
|
||||
* Fixed the bug where defaults were not being applied properly.
|
||||
* Fixed the bug with translations not being applied properly.
|
||||
* Cleaned up the code (to pass JSHint validation).
|
||||
|
||||
### 1.0.2
|
||||
* Fixed the issue with modified Array prototypes
|
||||
* Fixed the issue with modified Array prototypes.
|
||||
|
||||
### 1.0.1
|
||||
* Added `complete`, `load` and `error` properties that can be set with function handlers to be invoked on load completion, successful file load or failed load respectively
|
||||
* Fixed language container initialization bug
|
||||
* Fixed bug that was causing parse errors not be displayed
|
||||
* Added `complete`, `load` and `error` properties that can be set with function handlers to be invoked on load completion, successful file load or failed load respectively.
|
||||
* Fixed language container initialization bug.
|
||||
* Fixed bug that was causing parse errors not be displayed.
|
||||
|
||||
### 1.0
|
||||
* Added GANTT chart support
|
||||
* Added GANTT chart support.
|
||||
|
||||
### 0.9.2
|
||||
* Added global data load methods that can be used to load and parse data by code outside plugin
|
||||
* Trim CSV column names
|
||||
* Translation added: Lithuanian
|
||||
* Added global data load methods that can be used to load and parse data by code outside plugin.
|
||||
* Trim CSV column names.
|
||||
* Translation added: Lithuanian.
|
||||
|
||||
### 0.9.1
|
||||
* Fix chart animations not playing after asynchronous load
|
||||
* Fix chart animations not playing after asynchronous load.
|
||||
|
||||
### 0.9
|
||||
* Initial release
|
||||
* Initial release.
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue