Skip to content

Commit

Permalink
Merge pull request #12115 from rwjblue/remove-metal-stream-feature
Browse files Browse the repository at this point in the history
Remove ember-metal-stream feature.
  • Loading branch information
rwjblue committed Aug 16, 2015
2 parents ce89367 + 8804a08 commit 68dec3d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 33 deletions.
6 changes: 0 additions & 6 deletions FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ for a detailed explanation.
Enables HTMLBars compiler to interpret `<x-foo></x-foo>` as a component
invocation (instead of a standard HTML5 style element).

* `ember-metal-stream`

Exposes the basic internal stream implementation as `Ember.Stream`.

Added in [#9693](https://github.com/emberjs/ember.js/pull/9693)

* `ember-htmlbars-each-with-index`

Adds an optional second parameter to `{{each}}` block parameters that is the index of the item.
Expand Down
1 change: 0 additions & 1 deletion features.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"features-stripped-test": null,
"ember-htmlbars-component-generation": null,
"ember-testing-checkbox-helpers": null,
"ember-metal-stream": null,
"ember-application-visit": null,
"ember-routing-core-outlet": null,
"ember-routing-route-configured-query-params": null,
Expand Down
17 changes: 0 additions & 17 deletions packages/ember-metal/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,23 +336,6 @@ Ember.isPresent = isPresent;

Ember.merge = merge;

if (isEnabled('ember-metal-stream')) {
Ember.stream = {
Stream: Stream,

isStream: isStream,
subscribe: subscribe,
unsubscribe: unsubscribe,
read: read,
readHash: readHash,
readArray: readArray,
scanArray: scanArray,
scanHash: scanHash,
concat: concat,
chain: chain
};
}

Ember.FEATURES = FEATURES;
Ember.FEATURES.isEnabled = isEnabled;

Expand Down
18 changes: 9 additions & 9 deletions packages/ember-metal/lib/streams/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Stream from './stream';
/*
Check whether an object is a stream or not
@public
@private
@for Ember.stream
@function isStream
@param {Object|Stream} object object to check whether it is a stream
Expand Down Expand Up @@ -36,7 +36,7 @@ export function subscribe(object, callback, context) {
A method of unsubscribing from a stream which is safe for use with a non-stream
object. If a non-stream object is passed, the function does nothing.
@public
@private
@for Ember.stream
@function unsubscribe
@param {Object|Stream} object object or stream to potentially unsubscribe from
Expand All @@ -53,7 +53,7 @@ export function unsubscribe(object, callback, context) {
Retrieve the value of a stream, or in the case a non-stream object is passed,
return the object itself.
@public
@private
@for Ember.stream
@function read
@param {Object|Stream} object object to return the value of
Expand All @@ -70,7 +70,7 @@ export function read(object) {
/*
Map an array, replacing any streams with their values.
@public
@private
@for Ember.stream
@function readArray
@param {Array} array The array to read values from
Expand All @@ -92,7 +92,7 @@ export function readArray(array) {
Map a hash, replacing any stream property values with the current value of that
stream.
@public
@private
@for Ember.stream
@function readHash
@param {Object} object The hash to read keys and values from
Expand All @@ -112,7 +112,7 @@ export function readHash(object) {
/*
Check whether an array contains any stream values
@public
@private
@for Ember.stream
@function scanArray
@param {Array} array array given to a handlebars helper
Expand All @@ -136,7 +136,7 @@ export function scanArray(array) {
/*
Check whether a hash has any stream property values
@public
@private
@for Ember.stream
@function scanHash
@param {Object} hash "hash" argument given to a handlebars helper
Expand All @@ -159,7 +159,7 @@ export function scanHash(hash) {
/*
Join an array, with any streams replaced by their current values
@public
@private
@for Ember.stream
@function concat
@param {Array} array An array containing zero or more stream objects and
Expand Down Expand Up @@ -308,7 +308,7 @@ export function zipHash(object, callback, label) {
In the example, result is a stream if source is a stream, or a number of
source was numeric.
@public
@private
@for Ember.stream
@function chain
@param {Object|Stream} value A stream or non-stream object
Expand Down

0 comments on commit 68dec3d

Please sign in to comment.