Skip to content

Commit

Permalink
updated vendor to v0.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuel van Rijn committed Oct 17, 2013
1 parent 1c2a499 commit c182b0f
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ See the [demo page of Brian Reavis](http://brianreavis.github.io/selectize.js/)

| Version | Notes |
| -------:| ----------------------------------------------------------- |
| 0.8.1 | Update to v0.8.1 of selectize.js |
| 0.8.0 | Update to v0.8.0 of selectize.js |
| 0.7.7 | Update to v0.7.7 of selectize.js |
| 0.7.6 | Update to v0.7.6 of selectize.js |
Expand Down
2 changes: 1 addition & 1 deletion lib/selectize-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Selectize
module Rails
VERSION = "0.8.0"
VERSION = "0.8.1"
end
end
17 changes: 15 additions & 2 deletions vendor/assets/javascripts/selectize.js
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@
}));

/**
* selectize.js (v0.8.0)
* selectize.js (v0.8.1)
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down Expand Up @@ -1217,6 +1217,13 @@
self.ignoreHover = false;
});

// store original children and tab index so that they can be
// restored when the destroy() method is called.
this.revertSettings = {
$children : self.$input.children().detach(),
tabindex : self.$input.attr('tabindex')
};

self.$input.attr('tabindex', -1).hide().after(self.$wrapper);

if ($.isArray(settings.items)) {
Expand Down Expand Up @@ -2759,12 +2766,18 @@
destroy: function() {
var self = this;
var eventNS = self.eventNS;
var revertSettings = self.revertSettings;

self.trigger('destroy');
self.off();
self.$wrapper.remove();
self.$dropdown.remove();
self.$input.show();

self.$input
.html('')
.append(revertSettings.$children)
.attr({tabindex: revertSettings.tabindex})
.show();

$(window).off(eventNS);
$(document).off(eventNS);
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/selectize.bootstrap2.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap2.css (v0.8.0) - Bootstrap 2 Theme
* selectize.bootstrap2.css (v0.8.1) - Bootstrap 2 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/selectize.bootstrap3.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap3.css (v0.8.0) - Bootstrap 3 Theme
* selectize.bootstrap3.css (v0.8.1) - Bootstrap 3 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/selectize.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.css (v0.8.0)
* selectize.css (v0.8.1)
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/selectize.default.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.default.css (v0.8.0) - Default Theme
* selectize.default.css (v0.8.1) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/selectize.legacy.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.legacy.css (v0.8.0) - Default Theme
* selectize.legacy.css (v0.8.1) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down

0 comments on commit c182b0f

Please sign in to comment.