Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed google.load issue with charts #119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed google.load issue with charts #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/google_visualr/base_chart.rb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def to_js(element_id)
def load_js(element_id)
language_opt = ", language: '#{language}'" if language

"\n google.load('visualization', '#{version}', {packages: ['#{package_name}']#{language_opt}, callback: #{chart_function_name(element_id)}});"
"\n google.charts.load('visualization', '#{version}', {packages: ['#{package_name}']#{language_opt}, callback: #{chart_function_name(element_id)}});"
end

# Generates JavaScript function for rendering the chart.
Expand Down
6 changes: 3 additions & 3 deletions spec/support/common.rb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def base_chart(data_table = data_table())
def base_chart_js_without_script_tag(div_class = "div_class", language = nil)
language_opt = ", language: '#{language}'" if language

js = "\n google.load('visualization', '1.0', {packages: ['basechart']#{language_opt}, callback: draw_#{div_class}});"
js = "\n google.charts.load('visualization', '1.0', {packages: ['basechart']#{language_opt}, callback: draw_#{div_class}});"
js << "\n function draw_#{div_class}() {"
js << "\n var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
js << "\n chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
Expand All @@ -35,7 +35,7 @@ def base_chart_js(div_class = "div_class", language = nil)

def base_chart_with_listener_js(div_class = "div_class")
js = "\n<script type='text/javascript'>"
js << "\n google.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
js << "\n google.charts.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
js << "\n function draw_#{div_class}() {"
js << "\n var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
js << "\n google.visualization.events.addListener(chart, 'select', function() {test_event(chart);});"
Expand All @@ -46,7 +46,7 @@ def base_chart_with_listener_js(div_class = "div_class")

def material_chart(div_class = "div_class")
js = "\n<script type='text/javascript'>"
js << "\n google.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
js << "\n google.charts.load('visualization', '1.0', {packages: ['basechart'], callback: draw_#{div_class}});"
js << "\n function draw_#{div_class}() {"
js << "\n var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n var chart = new google.charts.Base(document.getElementById('#{div_class}'));"
js << "\n chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
Expand Down
2 changes: 1 addition & 1 deletion spec/turbolinks_tests/broken.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a href="index.html">home</a>
<div id="chart"> </div>
<script>
google.load('visualization','1', {packages: ['corechart']});
google.charts.load('visualization','1', {packages: ['corechart']});
google.setOnLoadCallback(draw_chart);
function draw_chart() {
var data_table = new google.visualization.DataTable();data_table.addColumn({"type":"string","label":"Employee"});data_table.addColumn({"type":"number","label":"Base Hourly"});data_table.addRow([{v: "Mike Ross"}, {v: 8}]);data_table.addRow([{v: "Moe Syzlack"}, {v: 12}]);
Expand Down
2 changes: 1 addition & 1 deletion spec/turbolinks_tests/fixed.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a href="index.html">home</a>
<div id="chart"> </div>
<script>
google.load('visualization','1', {packages: ['corechart'], callback: draw_chart});
google.charts.load('visualization','1', {packages: ['corechart'], callback: draw_chart});
function draw_chart() {
var data_table = new google.visualization.DataTable();data_table.addColumn({"type":"string","label":"Employee"});data_table.addColumn({"type":"number","label":"Base Hourly"});data_table.addRow([{v: "Mike Ross"}, {v: 8}]);data_table.addRow([{v: "Moe Syzlack"}, {v: 12}]);
var chart = new google.visualization.BarChart(document.getElementById('chart'));
Expand Down
2 changes: 1 addition & 1 deletion spec/turbolinks_tests/old.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a href="index.html">home</a>
<div id="chart"> </div>
<script>
google.load('visualization','1', {packages: ['corechart'], callback: function() {
google.charts.load('visualization','1', {packages: ['corechart'], callback: function() {
var data_table = new google.visualization.DataTable();data_table.addColumn({"type":"string","label":"Employee"});data_table.addColumn({"type":"number","label":"Base Hourly"});data_table.addRow([{v: "Mike Ross"}, {v: 8}]);data_table.addRow([{v: "Moe Syzlack"}, {v: 12}]);
var chart = new google.visualization.BarChart(document.getElementById('chart'));
chart.draw(data_table, {isStacked: true, width: 900, height: 900, title: "Hours Worked by Payroll Category by Employee", vAxis: {title: "Employee"}, hAxis: {title: "Hours Worked"}, chartArea: {top: 20, bottom: 0}});
Expand Down