Skip to content

Commit

Permalink
Minor version bump and docs update
Browse files Browse the repository at this point in the history
  • Loading branch information
danb-humaan committed Apr 18, 2016
1 parent c6a23c1 commit 7cf81fe
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ confirm_content|`string`|`<p>This is the default confirm dialog content. Replace
loading_content|`string`|`Loading &hellip;`||HTML content for loading message.
loading_class|`string`|`is_loading`||Class name to be applied while content is loaded via ajax.
ajax_error_class|`string`|`modaal-error`||Class name to be applied when content has failed to load. Default is ''
instagram_id|`string`|`null`||Unique photo ID for an instagram photo.
instagram_id|`string`|`null`||Unique photo ID for an Instagram photo.

#### 2.3. Inline Attribute Configuration
Modaal has been developed to support common jQuery configuration options, but in an effort to extend functionality and widen it's usage we've developed support for inline `data-option-name` attribute support.
Expand All @@ -100,15 +100,15 @@ It's important to note, that configuration options that contain an underscore (`
#### 2.4. Configuration Events
event | params | notes
------|--------|-------
before_open||Executed before the modaal has revealed
after_open||Executed once the duration for Option `after_callback_delay` has expired after the open method is called.
before_close||Executed once the Modaal has been instructed to close.
before_open|`event`|Executed before the modaal has revealed
after_open|`modal_wrapper`|Executed once the duration for Option `after_callback_delay` has expired after the open method is called.
before_close|`modal_wrapper`|Executed once the Modaal has been instructed to close.
after_close||Executed once the the duration for `after_callback_delay` has expired after the close method is called.
before_image_change|`current_item`<br /> `incoming_item`|Executed before the image changes in a gallery Modaal.
after_image_change|`current_item`| Executed after the image has changed in a gallery Modaal.
confirm_callback||Executed when the confirm button is pressed as opposed to cancel
source||Callback function executed on the default source, it is intended to transform the source (href in an ajax modal or iframe). The function passes in the triggering element as well as the default source depending of the modal type. The default output of the function is an untransformed default source.
ajax_success||Callback for when AJAX content is loaded in
confirm_callback|`lastFocus`|Executed when the confirm button is pressed as opposed to cancel
source||Callback function executed on the default source, it is intended to transform the source (href in an AJAX modal or iframe). The function passes in the triggering element as well as the default source depending of the modal type. The default output of the function is an untransformed default source.
ajax_success|`target`|Callback for when AJAX content is loaded in


###### 2.4.1 Working With Events
Expand Down Expand Up @@ -191,5 +191,5 @@ Thanks for your contribution! Please refer to the guidelines below.


## License
Copyright © [Humaan](http://www.humaan.com)
Licensed under the MIT license.
Copyright © [Humaan](http://humaan.com)
Licensed under the MIT license.
8 changes: 4 additions & 4 deletions dist/js/modaal.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
width (integer) : Desired width of the modal. Required for iframe type. Defaults to undefined //TODO
height (integer) : Desired height of the modal. Required for iframe type. Defaults to undefined //TODO
=== Events ===
before_open (function) : Callback function executed before modal is opened
Expand All @@ -45,6 +44,7 @@
as well as the default source depending of the modal type. The default output of the
function is an untransformed default source.
=== Confirm Options & Events ===
confirm_button_text (string) : Text on the confirm button. Defaults to 'Confirm'
confirm_cancel_button_text (string) : Text on the confirm modal cancel button. Defaults to 'Cancel'
Expand All @@ -61,13 +61,13 @@
=== AJAX Options & Events ===
loading_content (string) : HTML content for loading message. Default 'Loading &hellip;'
loading_class (string) : Class name to be applied while content is loaded via ajax. Default 'is_loading'
loading_class (string) : Class name to be applied while content is loaded via AJAX. Default 'is_loading'
ajax_error_class (string) : Class name to be applied when content has failed to load. Default is 'modaal-error'
ajax_success (function) : Callback for when AJAX content is loaded in
=== SOCIAL CONTENT ===
instagram_id (string) : Unique photo ID for an instagram photo.
instagram_id (string) : Unique photo ID for an Instagram photo.
*/
( function( $ ) {
Expand Down Expand Up @@ -796,7 +796,7 @@
var modal_wrapper = $( '#' + self.scope.id );

// CB: before_close
self.options.before_close.call(self);
self.options.before_close.call(self, modal_wrapper);

if (self.xhr !== null){
self.xhr.abort();
Expand Down
Loading

0 comments on commit 7cf81fe

Please sign in to comment.