diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
| commit | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (patch) | |
| tree | 39cf3564b1b2fb6be26499eda2a41be7ba59ad65 /vendor/gems/json-1.5.1/data/index.html | |
| parent | ea977a0b9e86bc99a84de8577fa4ce1d304ac489 (diff) | |
| parent | 08dac0261325cd757b7146f9626f3c7b48cc672c (diff) | |
Merge branch 'release/0.6'0.6
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/en_IE/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/ga_IE/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
spec/fixtures/locale/en/app.po
Diffstat (limited to 'vendor/gems/json-1.5.1/data/index.html')
| -rw-r--r-- | vendor/gems/json-1.5.1/data/index.html | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/vendor/gems/json-1.5.1/data/index.html b/vendor/gems/json-1.5.1/data/index.html deleted file mode 100644 index abe6fdbfa..000000000 --- a/vendor/gems/json-1.5.1/data/index.html +++ /dev/null @@ -1,38 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> - <head> - <title>Javascript Example</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <script src="prototype.js" type="text/javascript"></script> - </head> - - <body> - <h1>Fetching object from server</h1> - <div id="list"> - Wait...<br/> - <noscript><p>Switch on Javascript!</p></noscript> - </div> - <script type="text/javascript"> - <!-- - function pollJSON() { - new Ajax.Request('/json', - { - method: 'get', - onSuccess: function(transport) { - var response = transport.responseText || "no response text"; - response = eval("(" + response + ")"); - var text = ""; - for (var k in response) { - text = text + "<b>" + k + "</b>: " + response[k] + "<br/>" - } - $("list").update(text); - }, - onFailure: function() { alert('Something went wrong...') } - }); - } - new PeriodicalExecuter(pollJSON, 1); - --> - </script> - </body> -</html> |