jquery-plugin-circliful-rails 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/jquery/plugin/circliful/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/jquery.circliful.js +32 -9
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8315e9ecc31c857a09828495834958a66f80b670
4
- data.tar.gz: 9ee140d6485b52681d8bb76eb3f6029348c6ad67
3
+ metadata.gz: 6caca3919cb5c3a43e3a7a12255022e9df979fae
4
+ data.tar.gz: 1e46408a4ba777589720da97df6e7ab75762858e
5
5
  SHA512:
6
- metadata.gz: d50d1e847558466762c70f26bc555d722177e4d7e97fb48cd8ffdd7b4e886e5ef355760962b59e657b7b5eda73cd4aeef214ae38afc5537d56dad74cefad3408
7
- data.tar.gz: 3aaa6cc8f6fbfca7feedeba93d33d6cb4a4a04c656db6cc06b4f75bc6ee58d6ac2a3e27817802bf2b43cc76f043ddaf9a72dd5a085ed1bc3cb570b3387dd01d3
6
+ metadata.gz: 17244fbc0a338cdd637650d40a4b96b2e2e9e26dae6466670c6a8e9affda871f9f43a14bc7cb88776d47dc183ac53dfd9837850c25a45e65ddce5c4ab42d4edd
7
+ data.tar.gz: 0f32d7335c2da94f7652fb66e8c8dda5b7770553b0a67784f84a0d11b67c65d75913da41f2fb7ffcbd6b94e0b5f1ebdaeb33220fff4c69ddb8f0e267c06a737c
data/lib/jquery/plugin/circliful/rails/version.rb CHANGED
@@ -2,7 +2,7 @@ module Jquery
2
2
  module Plugin
3
3
  module Circliful
4
4
  module Rails
5
- VERSION = "1.0.3"
5
+ VERSION = "1.0.4"
6
6
  end
7
7
  end
8
8
  end
data/vendor/assets/javascripts/jquery.circliful.js CHANGED
@@ -26,7 +26,7 @@
26
26
  showPercent: 1,
27
27
  percentageTextSize: 22,
28
28
  percentageX: 100,
29
- percentageY: 100,
29
+ percentageY: 113,
30
30
  textAdditionalCss: '',
31
31
  targetPercent: 0,
32
32
  targetTextSize: 17,
@@ -46,7 +46,8 @@
46
46
  decimals: 0,
47
47
  alwaysDecimals: false,
48
48
  title: 'Circle Chart',
49
- description: ''
49
+ description: '',
50
+ progressColor: null
50
51
  }, options);
51
52
 
52
53
  return this.each(function () {
@@ -63,6 +64,7 @@
63
64
  var elements;
64
65
  var icon;
65
66
  var backgroundBorderWidth = settings.backgroundBorderWidth;
67
+ var progressColor = settings.progressColor
66
68
 
67
69
  if (settings.halfCircle) {
68
70
  if (settings.iconPosition == 'left') {
@@ -104,21 +106,23 @@
104
106
  iconX = 120;
105
107
  iconY = 110;
106
108
  percentageX = 80;
109
+ } else if (settings.iconPosition == 'top' && settings.icon != 'none') {
110
+ percentageY = 120;
107
111
  }
108
112
  }
109
113
 
110
- if (settings.targetPercent > 0) {
114
+ if (settings.targetPercent > 0 && settings.halfCircle != true) {
111
115
  percentageY = 95;
112
116
  elements = '<g stroke="' + (settings.backgroundColor != 'none' ? settings.backgroundColor : '#ccc') + '" ><line x1="75" y1="101" x2="125" y2="101" stroke-width="1" /></g>';
113
117
  elements += '<text text-anchor="middle" x="' + percentageX + '" y="120" style="font-size: ' + settings.targetTextSize + 'px;" fill="' + settings.targetColor + '">' + settings.targetPercent + (settings.noPercentageSign && settings.replacePercentageByText == null ? '' : '%') + '</text>';
114
118
  elements += '<circle cx="100" cy="100" r="69" fill="none" stroke="' + settings.backgroundColor + '" stroke-width="3" stroke-dasharray="450" transform="rotate(-90,100,100)" />';
115
- elements += '<circle cx="100" cy="100" r="69" fill="none" stroke="' + settings.targetColor + '" stroke-width="3" stroke-dasharray="' + (360 / 100 * settings.targetPercent) + ', 20000" transform="rotate(-90,100,100)" />';
119
+ elements += '<circle cx="100" cy="100" r="69" fill="none" stroke="' + settings.targetColor + '" stroke-width="3" stroke-dasharray="' + (435 / 100 * settings.targetPercent) + ', 20000" transform="rotate(-90,100,100)" />';
116
120
  }
117
121
 
118
122
  if (settings.text != null) {
119
123
  if (settings.halfCircle) {
120
124
  if (settings.textBelow) {
121
- elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100') + '" y="' + (settings.textY != null ? settings.textY : '120') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
125
+ elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100') + '" y="' + (settings.textY != null ? settings.textY : '64%') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
122
126
  }
123
127
  else if (settings.multiPercentage == 0) {
124
128
  elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100' ) + '" y="' + (settings.textY != null ? settings.textY : '115') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
@@ -128,7 +132,7 @@
128
132
  }
129
133
  } else {
130
134
  if (settings.textBelow) {
131
- elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100' ) + '" y="' + (settings.textY != null ? settings.textY : '190') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
135
+ elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100' ) + '" y="' + (settings.textY != null ? settings.textY : '99%') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
132
136
  }
133
137
  else if (settings.multiPercentage == 0) {
134
138
  elements += '<text text-anchor="middle" x="' + (settings.textX != null ? settings.textX : '100' ) + '" y="' + (settings.textY != null ? settings.textY : '115') + '" style="' + settings.textStyle + '" fill="' + settings.textColor + '">' + settings.text + '</text>';
@@ -233,9 +237,14 @@
233
237
  angle += angleIncrement;
234
238
  summary += oneStep;
235
239
  }
236
-
237
- if (angle / 3.6 >= percent && last == 1) {
238
- angle = 3.6 * percent;
240
+ if (settings.halfCircle) {
241
+ if (angle * 2 / 3.6 >= percent && last == 1) {
242
+ angle = (3.6 * percent) / 2
243
+ }
244
+ } else {
245
+ if (angle / 3.6 >= percent && last == 1) {
246
+ angle = 3.6 * percent;
247
+ }
239
248
  }
240
249
 
241
250
  if (summary > settings.target && last == 1) {
@@ -269,6 +278,20 @@
269
278
  .find('.percent')
270
279
  .text('');
271
280
  }
281
+
282
+ if (progressColor != null) {
283
+ $.each(progressColor, function(key, color){
284
+ if (settings.halfCircle) {
285
+ key /= 2
286
+ }
287
+ if ( angle >= key * 3.6) {
288
+ circle.css({
289
+ stroke: color,
290
+ transition: 'stroke 0.1s linear'
291
+ });
292
+ }
293
+ });
294
+ }
272
295
  }.bind(circle), interval);
273
296
  }
274
297
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jquery-plugin-circliful-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - ChenChingHao(howard60915)
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-05-12 00:00:00.000000000 Z
11
+ date: 2017-06-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler