Commit 4f0eace4d89566ebcbd13c40cdd5321abad08aa5
1 parent
610191bc
Exists in
master
and in
1 other branch
Test for draggable plugin instead of try..catch
Showing
1 changed file
with
46 additions
and
48 deletions
Show diff stats
public/javascripts/jquery.alerts.js
| @@ -111,60 +111,58 @@ | @@ -111,60 +111,58 @@ | ||
| 111 | $.alerts._maintainPosition(true); | 111 | $.alerts._maintainPosition(true); |
| 112 | 112 | ||
| 113 | switch( type ) { | 113 | switch( type ) { |
| 114 | - case 'alert': | ||
| 115 | - $("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /></div>'); | ||
| 116 | - $("#popup_ok").click( function() { | ||
| 117 | - $.alerts._hide(); | ||
| 118 | - callback(true); | ||
| 119 | - }); | ||
| 120 | - $("#popup_ok").focus().keypress( function(e) { | ||
| 121 | - if( e.keyCode == 13 || e.keyCode == 27 ) $("#popup_ok").trigger('click'); | ||
| 122 | - }); | 114 | + case 'alert': |
| 115 | + $("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /></div>'); | ||
| 116 | + $("#popup_ok").click( function() { | ||
| 117 | + $.alerts._hide(); | ||
| 118 | + callback(true); | ||
| 119 | + }); | ||
| 120 | + $("#popup_ok").focus().keypress( function(e) { | ||
| 121 | + if( e.keyCode == 13 || e.keyCode == 27 ) $("#popup_ok").trigger('click'); | ||
| 122 | + }); | ||
| 123 | break; | 123 | break; |
| 124 | - case 'confirm': | ||
| 125 | - $("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>'); | ||
| 126 | - $("#popup_ok").click( function() { | ||
| 127 | - $.alerts._hide(); | ||
| 128 | - if( callback ) callback(true); | ||
| 129 | - }); | ||
| 130 | - $("#popup_cancel").click( function() { | ||
| 131 | - $.alerts._hide(); | ||
| 132 | - if( callback ) callback(false); | ||
| 133 | - }); | ||
| 134 | - $("#popup_ok").focus(); | ||
| 135 | - $("#popup_ok, #popup_cancel").keypress( function(e) { | ||
| 136 | - if( e.keyCode == 13 ) $("#popup_ok").trigger('click'); | ||
| 137 | - if( e.keyCode == 27 ) $("#popup_cancel").trigger('click'); | ||
| 138 | - }); | 124 | + case 'confirm': |
| 125 | + $("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>'); | ||
| 126 | + $("#popup_ok").click( function() { | ||
| 127 | + $.alerts._hide(); | ||
| 128 | + if( callback ) callback(true); | ||
| 129 | + }); | ||
| 130 | + $("#popup_cancel").click( function() { | ||
| 131 | + $.alerts._hide(); | ||
| 132 | + if( callback ) callback(false); | ||
| 133 | + }); | ||
| 134 | + $("#popup_ok").focus(); | ||
| 135 | + $("#popup_ok, #popup_cancel").keypress( function(e) { | ||
| 136 | + if( e.keyCode == 13 ) $("#popup_ok").trigger('click'); | ||
| 137 | + if( e.keyCode == 27 ) $("#popup_cancel").trigger('click'); | ||
| 138 | + }); | ||
| 139 | break; | 139 | break; |
| 140 | - case 'prompt': | ||
| 141 | - $("#popup_message").append('<br /><input type="text" size="30" id="popup_prompt" />').after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>'); | ||
| 142 | - $("#popup_prompt").width( $("#popup_message").width() ); | ||
| 143 | - $("#popup_ok").click( function() { | ||
| 144 | - var val = $("#popup_prompt").val(); | ||
| 145 | - $.alerts._hide(); | ||
| 146 | - if( callback ) callback( val ); | ||
| 147 | - }); | ||
| 148 | - $("#popup_cancel").click( function() { | ||
| 149 | - $.alerts._hide(); | ||
| 150 | - if( callback ) callback( null ); | ||
| 151 | - }); | ||
| 152 | - $("#popup_prompt, #popup_ok, #popup_cancel").keypress( function(e) { | ||
| 153 | - if( e.keyCode == 13 ) $("#popup_ok").trigger('click'); | ||
| 154 | - if( e.keyCode == 27 ) $("#popup_cancel").trigger('click'); | ||
| 155 | - }); | ||
| 156 | - if( value ) $("#popup_prompt").val(value); | ||
| 157 | - $("#popup_prompt").focus().select(); | 140 | + case 'prompt': |
| 141 | + $("#popup_message").append('<br /><input type="text" size="30" id="popup_prompt" />').after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>'); | ||
| 142 | + $("#popup_prompt").width( $("#popup_message").width() ); | ||
| 143 | + $("#popup_ok").click( function() { | ||
| 144 | + var val = $("#popup_prompt").val(); | ||
| 145 | + $.alerts._hide(); | ||
| 146 | + if( callback ) callback( val ); | ||
| 147 | + }); | ||
| 148 | + $("#popup_cancel").click( function() { | ||
| 149 | + $.alerts._hide(); | ||
| 150 | + if( callback ) callback( null ); | ||
| 151 | + }); | ||
| 152 | + $("#popup_prompt, #popup_ok, #popup_cancel").keypress( function(e) { | ||
| 153 | + if( e.keyCode == 13 ) $("#popup_ok").trigger('click'); | ||
| 154 | + if( e.keyCode == 27 ) $("#popup_cancel").trigger('click'); | ||
| 155 | + }); | ||
| 156 | + if( value ) $("#popup_prompt").val(value); | ||
| 157 | + $("#popup_prompt").focus().select(); | ||
| 158 | break; | 158 | break; |
| 159 | - default: break; | 159 | + default: break; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | // Make draggable | 162 | // Make draggable |
| 163 | - if( $.alerts.draggable ) { | ||
| 164 | - try { | ||
| 165 | - $("#popup_container").draggable({ handle: $("#popup_title") }); | ||
| 166 | - $("#popup_title").css({ cursor: 'move' }); | ||
| 167 | - } catch(e) { /* requires jQuery UI draggables */ } | 163 | + if ($.alerts.draggable && $.fn.draggable) { |
| 164 | + $("#popup_container").draggable({ handle: $("#popup_title") }); | ||
| 165 | + $("#popup_title").css({ cursor: 'move' }); | ||
| 168 | } | 166 | } |
| 169 | }, | 167 | }, |
| 170 | 168 |