c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix javascript errors

Browse Source
This commit is contained in:
Lee Lawlor 2014-08-01 22:10:21 -04:00
parent 28bc4e18e5
commit b598a83e37
5 changed files with 94 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/channels/_private_show.html.erb
View File

@ -12,20 +12,25 @@
<div id="private_dialog1" class="column" > </div> <div id="private_dialog1" class="column" > </div>
</div> </div>
<script> <script>
$(document).on('page:load ready', function() { // when the document is ready
$("#devInfoLink_private").click( $(document).on('page:load ready', function() {
function(e) {
// when the devinfo link is clicked
$("#devInfoLink_private").click(function(e) {
var element = $("#devInfo"); var element = $("#devInfo");
openDialogCenter(element); openDialogCenter(element);
return false;
}); });
$("#portletAddLink_private").click(
function(e) { // when the add window link is clicked
$("#addPortlets").load('/channels/<%=@channel.id %>/hidden_windows?visibility_flag=private', $("#portletAddLink_private").click(function(e) {
function(e) { $("#addPortlets").load('/channels/<%=@channel.id %>/hidden_windows?visibility_flag=private', function(e) {
var element = $("#addPortlets"); var element = $("#addPortlets");
openDialogCenter(element); openDialogCenter(element);
}) ;
}); });
return false;
});
}); });
</script> </script>

17
app/views/channels/_public_show.html.erb
View File

@ -31,20 +31,25 @@
</div> </div>
<script> <script>
// when the document is ready
$(document).on('page:load ready', function() {
// when the devinfo link is clicked
$("#devInfoLink_public").click(function() { $("#devInfoLink_public").click(function() {
var element = $("#devInfo"); var element = $("#devInfo");
openDialogCenter(element); openDialogCenter(element);
return false;
}); });
$("#portletAddLink_public").click(function() // when the add window link is clicked
{ $("#portletAddLink_public").click(function() {
$("#addPortlets").load('/channels/<%=@channel.id %>/hidden_windows?visibility_flag=public', function() {
$("#addPortlets").load('/channels/<%=@channel.id %>/hidden_windows?visibility_flag=public',
function() {
var element = $("#addPortlets"); var element = $("#addPortlets");
openDialogCenter(element); openDialogCenter(element);
});
return false;
});
})
}); });
// comment flag function // comment flag function

2
app/views/maps/channel_show.html.erb
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<script type="text/javascript" src="http<%= 's' if @ssl %>://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script> <script type="text/javascript" src="http<%= 's' if @ssl %>://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="<%= @map_domain %>/maps/api/js?sensor=false"></script> <script type="text/javascript" src="<%= @map_domain %>/maps/api/js?sensor=false"></script>
<script type="text/javascript"> <script type="text/javascript">
// when document is ready // when document is ready

2
app/views/status/_recent.html.erb
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<%= stylesheet_link_tag 'application' %> <%= stylesheet_link_tag 'application' %>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<%= javascript_include_tag 'application' %> <%= javascript_include_tag 'application' %>
</head> </head>

17
app/views/windows/_hidden_windows.html.erb
View File

@ -1,6 +1,5 @@
<script> <script>
$(document).on('page:load ready', function() {
$("#tabs").tabs({ $("#tabs").tabs({
ajaxOptions: { ajaxOptions: {
error: function( xhr, status, index, anchor ) { error: function( xhr, status, index, anchor ) {
@ -11,9 +10,11 @@ $(document).on('page:load ready', function() {
} }
}); });
//Need to turn this into an ID so it doesn't run on more than one object // remove handler if it already exists
$(".ioplugin").off(); $(document).off('click', '.ioplugin');
$("body").on("click", ".ioplugin", function() {
// add click handler
$(document).on('click', '.ioplugin', function() {
var plugins = $(".plugin"); var plugins = $(".plugin");
var addPlugin = $(this); var addPlugin = $(this);
@ -45,8 +46,11 @@ $(document).on('page:load ready', function() {
}) ; }) ;
}); });
$(".ioportlet").click( // remove handler if it already exists
function() { $(document).off('click', '.ioportlet');
// add click handler
$(document).on('click', '.ioportlet', function() {
var addPortlet = $(this); var addPortlet = $(this);
var ids = addPortlet.attr('id').split("-"); var ids = addPortlet.attr('id').split("-");
@ -71,7 +75,6 @@ $(document).on('page:load ready', function() {
}) ; }) ;
}); });
});
</script> </script>
<div id="tabs"> <div id="tabs">
<ul> <ul>