Permalink
Browse files

Upgraded to prototype 1.7.0.0

  • Loading branch information...
Matthias Loitsch
Matthias Loitsch committed Feb 3, 2011
1 parent 80f25cb commit c6ea09cd219c7e15f4ddb14c9803bcf85fbe397d
Showing with 8 additions and 9 deletions.
  1. +5 −6 opentip.js
  2. +3 −3 test/index.html
View
@@ -45,8 +45,8 @@
*/
var Opentip = {
- Version: '1.2.10',
- REQUIRED_PROTOTYPE_VERSION: '1.6.0',
+ Version: '1.3.0',
+ REQUIRED_PROTOTYPE_VERSION: '1.7.0',
REQUIRED_SCRIPTACULOUS_VERSION: '1.8.0',
STICKS_OUT_TOP: 1,
STICKS_OUT_BOTTOM: 2,
@@ -229,12 +229,11 @@ Event.observe(window, Opentip.IEVersion() ? 'load' : 'dom:loaded', function() {
var optionValue;
if (optionValue = element.readAttribute('ot-' + optionName)) {
try {
- optionValue = optionValue.evalJSON(); // Not using sanitize, to avoid the isJSON check.
+ // See if it's a JSON string.
+ optionValue = optionValue.gsub("'", '"').evalJSON();
}
catch (err) {
- // Well it wasn't JSON.
- // I'm not using isJSON() here, so it's possible to write: [ 'left', 'top' ], which
- // isn't valid JSON.
+ // Well, it's not.
}
options[optionName.camelize()] = optionValue;
View
@@ -34,8 +34,8 @@
</style>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.3/prototype.js"></script>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/scriptaculous/1.8.2/scriptaculous.js"></script>
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/prototype/1.7.0.0/prototype.js"></script>
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/scriptaculous/1.8.3/scriptaculous.js"></script>
<script type="text/javascript" src="../opentip.js"></script>
<script type="text/javascript">
@@ -439,7 +439,7 @@
<div class="test">
<div ot="Hi this is a very simple tooltip.">Just defining ot.</div>
<div ot="Hi" ot-delay="0.99" ot-style="glass">Delay 0.99, style glass.</div>
- <a href="ajaxtest.html" ot="true" ot-show-on="click" ot-ajax="true" ot-stem="true" ot-tip-joint="[ 'right', 'middle' ]">Testing AJAX</a>
+ <a href="ajaxtest.html" ot="true" ot-show-on="click" ot-ajax="true" ot-stem="true" ot-tip-joint="[ 'center', 'bottom' ]">Testing AJAX. tip joint: center/bottom</a>
<div ot="Hi" ot-show-effect="condense" ot-hide-effect="puff">Testing the inline HTML options.</div>
</div>

0 comments on commit c6ea09c

Please sign in to comment.