Permalink
Browse files

Popup and popup unit tests: s/dismissable/dismissible/g

  • Loading branch information...
1 parent 9610f80 commit ef809a211e9c2217d000e834a0bc522fa51c434f @gabrielschulhof gabrielschulhof committed Nov 29, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 js/widgets/popup.js
  2. +1 −1 tests/unit/popup/index.html
  3. +2 −2 tests/unit/popup/popup_core.js
View
@@ -52,7 +52,7 @@ define( [ "jquery",
closeLinkEvents: "click.popup",
navigateEvents: "navigate.popup",
closeEvents: "navigate.popup pagebeforechange.popup",
- dismissable: true,
+ dismissible: true,
// NOTE Windows Phone 7 has a scroll position caching issue that
// requires us to disable popup history management by default
@@ -65,7 +65,7 @@ define( [ "jquery",
_eatEventAndClose: function( e ) {
e.preventDefault();
e.stopImmediatePropagation();
- if ( this.options.dismissable ) {
+ if ( this.options.dismissible ) {
this.close();
}
return false;
@@ -63,7 +63,7 @@
<p>This is the test popup</p>
</div>
- <div data-nstest-role="popup" id="test-popup-dismissable" data-nstest-dismissable="false">
+ <div data-nstest-role="popup" id="test-popup-dismissible" data-nstest-dismissible="false">
<p>This is the test popup</p>
</div>
</div>
@@ -475,8 +475,8 @@
]);
});
- asyncTest( "Cannot close a non-dismissable popup by clicking on the screen", function() {
- var $popup = $( "#test-popup-dismissable" ), eventNs = ".cannotCloseNonDismissablePopup";
+ asyncTest( "Cannot close a non-dismissible popup by clicking on the screen", function() {
+ var $popup = $( "#test-popup-dismissible" ), eventNs = ".cannotCloseNonDismissiblePopup";
$.testHelper.detailedEventCascade([
function() {

0 comments on commit ef809a2

Please sign in to comment.