thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  select2 4.0
This commit is contained in:
Matthew Dillon 2015-11-17 12:34:20 -07:00
commit acb17480ec
3 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/pods/components/x-select/component.js
View file

@ -1,6 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
const { Component } = Ember; const { Component, get, run: { schedule } } = Ember;
export default Component.extend({ export default Component.extend({
tagName: 'select', tagName: 'select',
@ -11,24 +11,43 @@ export default Component.extend({
options: null, options: null,
selected: null, selected: null,
nameAttr: null, nameAttr: null,
placeholder: null,
change: function() { change: function() {
this.attrs.update(this.$().select2('val')); let selectedInComponent = this.get('selected');
}, let selectedInWidget = this.$().val();
didInsertElement: function() { if (this.get('multiple')) {
if (this.get('placeholder')) { if (selectedInWidget === null) {
this.$().select2({ selectedInWidget = [];
placeholder: this.get('placeholder'), }
}); selectedInComponent = selectedInComponent.toString();
} else { selectedInWidget = selectedInWidget.toString();
this.$().select2(); }
// We need this to prevent an infinite loop of afterRender -> change.
if (selectedInComponent !== selectedInWidget) {
this.attrs.update(this.$().val());
} }
}, },
didInsertElement: function() {
let options = {};
options.placeholder = this.get('placeholder');
options.templateResult = function(item) {
if (!item.disabled) {
const text = get(item, 'element.innerHTML');
const $item = Ember.$(`<span>${text}</span>`);
return $item;
}
};
this.$().select2(options);
},
didRender: function() { didRender: function() {
Ember.run.schedule('afterRender', this, function() { const selected = this.get('selected');
this.$().select2('val', this.get('selected')); schedule('afterRender', this, function() {
this.$().val(selected).trigger('change');
}); });
}, },

2
bower.json
View file

@ -14,7 +14,7 @@
"qunit": "~1.20.0", "qunit": "~1.20.0",
"flakes": "~1.0.0", "flakes": "~1.0.0",
"moment": "~2.10.6", "moment": "~2.10.6",
"select2": "3.5.2", "select2": "4.0.1-rc.1",
"antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356", "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356",
"jquery-mousewheel": "~3.1.4", "jquery-mousewheel": "~3.1.4",
"jquery-ui": "~1.11.4", "jquery-ui": "~1.11.4",

10
ember-cli-build.js
View file

@ -15,7 +15,7 @@ module.exports = function(defaults) {
app.import('bower_components/quill/dist/quill.base.css'); app.import('bower_components/quill/dist/quill.base.css');
app.import('bower_components/quill/dist/quill.snow.css'); app.import('bower_components/quill/dist/quill.snow.css');
// select2 // select2
app.import('bower_components/select2/select2.css'); app.import('bower_components/select2/dist/css/select2.min.css');
// LIBS //////////////////////////////////////////////////////////////////////// // LIBS ////////////////////////////////////////////////////////////////////////
// flakes (and deps) // flakes (and deps)
@ -28,13 +28,7 @@ module.exports = function(defaults) {
// quill // quill
app.import('bower_components/quill/dist/quill.min.js'); app.import('bower_components/quill/dist/quill.min.js');
// select2 // select2
app.import('bower_components/select2/select2.min.js'); app.import('bower_components/select2/dist/js/select2.full.min.js');
// MISC ////////////////////////////////////////////////////////////////////////
// select2
app.import('bower_components/select2/select2.png', { destDir: 'assets' });
app.import('bower_components/select2/select2x2.png', { destDir: 'assets' });
app.import('bower_components/select2/select2-spinner.gif', { destDir: 'assets' });
return app.toTree(); return app.toTree();
}; };