Skip to content

Commit 11c4ca0

Browse files
author
Nicholas E. Ardecky
committed
Updating jQuery package
- removed lens functions (deprecated) - updated default height and width to 100% - updated zingchart version in examples - updated html examples - update animationEnd to animation_end (bug)
1 parent 5e03cd8 commit 11c4ca0

9 files changed

Lines changed: 22 additions & 80 deletions

File tree

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 PINT, Inc.
3+
Copyright (c) 2016 ZingChart.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

‎README.md‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,18 +1711,6 @@ Return | jQuery | [jQuery Object](http://api.jquery.com/Types/#jQuery)
17111711
$("#myChart").toggleLegend();
17121712
```
17131713

1714-
<br>
1715-
#### .toggleLens() ####
1716-
Toggle the visibility of the lens.
1717-
1718-
Value | Type | Details
1719-
--- | --- | ---
1720-
Return | jQuery | [jQuery Object](http://api.jquery.com/Types/#jQuery)
1721-
1722-
```javascript
1723-
$("#myChart").toggleLens();
1724-
```
1725-
17261714
<br>
17271715
#### .toggleSource() ####
17281716
Toggle the visibility of the View Source Screen.
@@ -3056,36 +3044,6 @@ $("#myChart").dimensionChange(function(){
30563044
});
30573045
```
30583046

3059-
<br>
3060-
#### .lensShow( callback )
3061-
Fires the callback when the lens is shown.
3062-
3063-
Value | Type | Details
3064-
--- | --- | ---
3065-
Parameter | [Callback](https://developer.mozilla.org/en-US/docs/Mozilla/js-ctypes/js-ctypes_reference/Callbacks)
3066-
Return | [jQuery](http://api.jquery.com/Types/#jQuery)
3067-
3068-
```javascript
3069-
$("#myChart").lensShow(function(){
3070-
// Make some magic
3071-
});
3072-
```
3073-
3074-
<br>
3075-
#### .lensHide( callback )
3076-
Fires the callback when the lens is hidden.
3077-
3078-
Value | Type | Details
3079-
--- | --- | ---
3080-
Parameter | [Callback](https://developer.mozilla.org/en-US/docs/Mozilla/js-ctypes/js-ctypes_reference/Callbacks)
3081-
Return | [jQuery](http://api.jquery.com/Types/#jQuery)
3082-
3083-
```javascript
3084-
$("#myChart").lensHide(function(){
3085-
// Make some magic
3086-
});
3087-
```
3088-
30893047
<br>
30903048
#### .sourceShow( callback )
30913049
Fires the callback when the source is shown.

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ZingChart-jQuery",
3-
"version": "1.0.3",
3+
"version": "2.0.0",
44
"homepage": "https://github.com/zingchart/ZingChart-jQuery",
55
"authors": [
66
"ZingChart"

‎docs/index.html‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,13 @@
933933
*/
934934

935935
// example three
936-
$('#ex_3').zingchart({data:data});
937-
$('#ex_3_button').click( function() {
936+
$('#ex_3').zingchart({data: {
937+
type: 'line',
938+
series: [{values: [1,2,3,4,5,6,7]}]
939+
}
940+
});
941+
$('#ex_3_button').click( function(e) {
942+
$('#ex_3').setType( 'area').setTitle( 'new title' );
938943
});
939944
});
940945
</script>
@@ -1003,7 +1008,7 @@ <h1>Example 3: Chaining on your ZingChart object</h1>
10031008
var myChart = $('#myDiv').zingchart( { data: data } );
10041009

10051010
$('#button').click( function() {
1006-
myChart.setData( { type: 'area' } ).title( 'new title' );
1011+
myChart.setType('area').setTitle( 'new title' );
10071012
});
10081013
</pre>
10091014
<button id="ex_3_button">change to area and reset title</button>

‎docs/table-convert.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<link rel="stylesheet" type="text/css" href="style.css">
55
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
6-
<script src="../zingchart-html5-min.js"></script>
6+
<script src="../zingchart.min.js"></script>
77
<script src="../zingchart.jquery.js"></script>
88
<script src="../zingify/zingify.jquery.js"></script>
99
<!-- <style type="text/css">

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zingchart-jquery",
3-
"version": "1.0.3",
3+
"version": "2.0.0",
44
"description": "Build fast and powerful charts with ZingChart and jQuery",
55
"main": "zingchart.jquery.min.js",
66
"directories": {

‎zingchart.jquery.js‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* View the README.md for detailed documentation. */
2-
/* Version 1.0.1 | Last Updated 22 Dec. 2014 */
2+
/* Version 2.0.0 | Last Updated 19 Oct. 2016 */
33

44
(function ( $ ) {
55

@@ -11,7 +11,9 @@
1111
$.fn.zingchart = function (options) {
1212
var id = this[0].id;
1313
var defaults = {
14-
id: id
14+
id: id,
15+
height: '100%',
16+
width: '100%'
1517
};
1618
$.extend(defaults, options);
1719
zingchart.render(defaults);
@@ -703,11 +705,6 @@
703705
return this;
704706
};
705707

706-
$.fn.toggleLens = function () {
707-
zingchart.exec(this[0].id, "togglelens");
708-
return this;
709-
};
710-
711708
$.fn.toggleSource = function () {
712709
zingchart.exec(this[0].id, "togglesource");
713710
return this;
@@ -756,7 +753,7 @@
756753
// ANIMATION EVENTS ====================================================
757754
$.fn.animationEnd = function (callback) {
758755
var jq = this;
759-
zingchart.bind(this[0].id, "animationEnd", function(p){
756+
zingchart.bind(this[0].id, "animation_end", function(p){
760757
$.extend(jq,{event:p});
761758
callback.call(jq)
762759
});
@@ -1321,24 +1318,6 @@
13211318
return this;
13221319
};
13231320

1324-
$.fn.lensShow = function (callback) {
1325-
var jq = this;
1326-
zingchart.bind(this[0].id, "lens_show", function(p){
1327-
$.extend(jq,{event:p});
1328-
callback.call(jq)
1329-
});
1330-
return this;
1331-
};
1332-
1333-
$.fn.lensHide = function (callback) {
1334-
var jq = this;
1335-
zingchart.bind(this[0].id, "lens_hide", function(p){
1336-
$.extend(jq,{event:p});
1337-
callback.call(jq)
1338-
});
1339-
return this;
1340-
};
1341-
13421321
$.fn.sourceShow = function (callback) {
13431322
var jq = this;
13441323
zingchart.bind(this[0].id, "source_show", function(p){

‎zingchart.jquery.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zingchart.min.js‎

100644100755
Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)