Bumping version to 0.5.2

ember-addons · Nov 21, 2013 · 90b42f7 · 90b42f7
1 parent 8eb1566
commit 90b42f7
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 51 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ember-addons.bootstrap_for_ember",
- "version": "0.5.1",
+ "version": "0.5.2",
  "description": "Bootstrap for Ember.js",
  "homepage": "http://ember-addons.github.io/bootstrap-for-ember",
  "authors": [

diff --git a/dist/js/bs-button.max.js b/dist/js/bs-button.max.js
@@ -115,7 +115,9 @@
  classNameBindings: ['blockClass'],
  classTypePrefix: 'btn',
  block: null,
- attributeBindings: ['disabled', 'dismiss:data-dismiss'],
+ attributeBindings: ['disabled', 'dismiss:data-dismiss', '_type:type'],
+ _type: 'button',
+ bubbles: true,
  init: function() {
  var attr, key, val, _ref, _results, _results1;
  this._super();
@@ -133,7 +135,7 @@
  }
  _results1 = [];
  for (attr in this) {
- if (attr.match(/^data-\w*$/) != null) {
+ if (attr.match(/^data-[\w-]*$/) != null) {
  _results1.push(this.attributeBindings.pushObject(attr));
  }
  }
@@ -147,7 +149,10 @@
  return null;
  }
  }).property('block').cacheable(),
- click: function() {
+ click: function(evt) {
+ if (!this.get('bubbles')) {
+ evt.stopPropagation();
+ }
  return this.sendAction('clicked');
  },
  loadingChanged: (function() {

diff --git a/dist/js/bs-button.min.js b/dist/js/bs-button.min.js
diff --git a/dist/js/bs-core.max.js b/dist/js/bs-core.max.js
@@ -171,7 +171,7 @@
  extraSmallSizeClass: (function() {
  var pref;
  pref = this.get('classTypePrefix');
- if (this.sx) {
+ if (this.xs) {
  return "" + pref + "-xs";
  } else {
  return null;