moar!

emberjs · Jun 25, 2015 · 61680ca · 61680ca
1 parent 1c50b17
commit 61680ca
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/packages/ember-runtime/lib/mixins/array.js b/packages/ember-runtime/lib/mixins/array.js
@@ -56,6 +56,8 @@ export function arrayContentDidChange(array, startIdx, removeAmt, addAmt) {
     adding = addAmt;
   }
 
+  propertyDidChange(array, '[]');
+  propertyDidChange(array, 'length');
   // TODO: something something
   // array.enumerableContentDidChange(removeAmt, adding);
   sendEvent(array, '@array:change', [array, startIdx, removeAmt, addAmt]);
@@ -110,6 +112,8 @@ export function arrayContentWillChange(array, startIdx, removeAmt, addAmt) {
     removing = removeAmt;
   }
 
+  propertyWillChange(array, '[]');
+  propertyWillChange(array, 'length');
   // TODO: can we kill these?
   //enumerableContentWillChange(array, removing, addAmt);
 }

diff --git a/packages/ember-runtime/lib/system/native_array.js b/packages/ember-runtime/lib/system/native_array.js
@@ -16,6 +16,7 @@ import Observable from 'ember-runtime/mixins/observable';
 import Copyable from 'ember-runtime/mixins/copyable';
 import { FROZEN_ERROR } from 'ember-runtime/mixins/freezable';
 import copy from 'ember-runtime/copy';
+
 export function replace(array, index, amt, objects) {
   if (this.isFrozen) {
     throw FROZEN_ERROR;

diff --git a/packages/ember-views/lib/views/select.js b/packages/ember-views/lib/views/select.js
@@ -15,11 +15,26 @@ import { A as emberA } from 'ember-runtime/system/native_array';
 import { observer } from 'ember-metal/mixin';
 import { defineProperty } from 'ember-metal/properties';
 import { objectAt } from 'ember-runtime/mixins/array';
-
 import htmlbarsTemplate from 'ember-htmlbars/templates/select';
 import selectOptionDefaultTemplate from 'ember-htmlbars/templates/select-option';
 import selectOptgroupDefaultTemplate from 'ember-htmlbars/templates/select-optgroup';
 
+function find(obj, callback, target) {
+  if (obj.find) { return obj.find(callback, target); }
+
+  if (!Array.isArray(obj)) { throw new TypeError('TODO: GOOD ERROR!!'); }
+
+  var result = [];
+  for (let i = 0; i < obj.length; i++) {
+    let entry = obj[i];
+    if (callback.call(target, entry, i, obj)) {
+      result.push(entry);
+    }
+  }
+
+  return result;
+
+}
 var defaultTemplate = htmlbarsTemplate;
 
 var SelectOption = View.extend({
@@ -535,7 +550,7 @@ var Select = View.extend({
     var selection;
 
     if (value !== selectedValue) {
-      selection = content ? content.find(function(obj) {
+      selection = content ? find(content, obj => {
         return value === (valuePath ? get(obj, valuePath) : obj);
       }) : null;
 
@@ -595,7 +610,10 @@ var Select = View.extend({
       var selectedIndexes = options.map(function() {
         return this.index - offset;
       });
-      var newSelection = content.objectsAt([].slice.call(selectedIndexes));
+
+      var newSelection = [].slice.call(selectedIndexes).map((index) => {
+        return objectAt(content, index);
+      });
 
       if (isArray(selection)) {
         replace(selection, 0, get(selection, 'length'), newSelection);