Skip to content

Commit

Permalink
[refactored] CDN build to fit in 80 chars and minimize globals
Browse files Browse the repository at this point in the history 
Summary: Preparing indefinite-observable to be hosted on googleapis.com

Reviewers: O3 Material JavaScript platform reviewers, #material_motion, O2 Material Motion, featherless

Reviewed By: #material_motion, O2 Material Motion, featherless

Tags: #material_motion

Differential Revision: http://codereview.cc/D2244
  • Loading branch information
@appsforartists
appsforartists committed Dec 12, 2016
1 parent 9a89d82 commit 6e587e3
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 116 deletions.
14 changes: 12 additions & 2 deletions build.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,11 @@ writeFileSync(
/symbol_observable_\d\.default/g,
'$$observable'
).replace(
/wrapWithObserver_\d\.default/g,
'wrapWithObserver'
/wrapWithObserver/g,
'_wrapWithObserver'
).replace(
/_wrapWithObserver_\d\.default/g,
'_wrapWithObserver'
).replace(
/Object\.defineProperty\(exports, "__esModule", \{ value: true \}\);/g,
''
Expand All @@ -75,5 +78,12 @@ writeFileSync(
).replace(
/\n\n+/g,
'\n\n'

// Use 2 spaces instead of 4 in the TypeScript output to keep comments wrapped
// to 80 chars. If we ever try to use spaces for alignment (independent of
// indentation), this regex will need to be revisited.
).replace(
/ /g,
' '
)
);
228 changes: 114 additions & 114 deletions dist/indefinite-observable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,34 @@

var $observable = (
() => {
var root;
var root;

if (typeof self !== 'undefined') {
root = self;
} else if (typeof window !== 'undefined') {
root = window;
} else if (typeof global !== 'undefined') {
root = global;
} else if (typeof module !== 'undefined') {
root = module;
} else {
root = Function('return this')();
}
if (typeof self !== 'undefined') {
root = self;
} else if (typeof window !== 'undefined') {
root = window;
} else if (typeof global !== 'undefined') {
root = global;
} else if (typeof module !== 'undefined') {
root = module;
} else {
root = Function('return this')();
}

var Symbol = root.Symbol;
var Symbol = root.Symbol;

if (typeof Symbol === 'function') {
if (Symbol.observable) {
result = Symbol.observable;
} else {
result = Symbol('observable');
Symbol.observable = result;
}
if (typeof Symbol === 'function') {
if (Symbol.observable) {
result = Symbol.observable;
} else {
result = '@@observable';
result = Symbol('observable');
Symbol.observable = result;
}
} else {
result = '@@observable';
}

return result;
return result;
}
)();

Expand All @@ -83,48 +83,48 @@ var $observable = (
* or `error` on the provided observer.
*/
class IndefiniteObservable {
/**
* The provided function should receive an observer and connect that
* observer's `next` method to an event source (for instance,
* `element.addEventListener('click', observer.next)`).
*
* It must return a function that will disconnect the observer from the event
* source.
*/
constructor(connect) {
this._connect = connect;
}
/**
* `subscribe` uses the function supplied to the constructor to connect an
* observer to an event source. Each observer is connected independently:
* each call to `subscribe` calls `connect` with the new observer.
*
* To disconnect the observer from the event source, call `unsubscribe` on the
* returned subscription.
*
* Note: `subscribe` accepts either a function or an object with a
* next method.
*/
subscribe(observerOrNext) {
const observer = wrapWithObserver(observerOrNext);
let disconnect = this._connect(observer);
return {
unsubscribe() {
if (disconnect) {
disconnect();
disconnect = undefined;
}
}
};
}
/**
* Tells other libraries that know about observables that we are one.
*
* https://github.com/tc39/proposal-observable#observable
*/
[$observable]() {
return this;
}
/**
* The provided function should receive an observer and connect that
* observer's `next` method to an event source (for instance,
* `element.addEventListener('click', observer.next)`).
*
* It must return a function that will disconnect the observer from the event
* source.
*/
constructor(connect) {
this._connect = connect;
}
/**
* `subscribe` uses the function supplied to the constructor to connect an
* observer to an event source. Each observer is connected independently:
* each call to `subscribe` calls `connect` with the new observer.
*
* To disconnect the observer from the event source, call `unsubscribe` on the
* returned subscription.
*
* Note: `subscribe` accepts either a function or an object with a
* next method.
*/
subscribe(observerOrNext) {
const observer = _wrapWithObserver(observerOrNext);
let disconnect = this._connect(observer);
return {
unsubscribe() {
if (disconnect) {
disconnect();
disconnect = undefined;
}
}
};
}
/**
* Tells other libraries that know about observables that we are one.
*
* https://github.com/tc39/proposal-observable#observable
*/
[$observable]() {
return this;
}
}

/**
Expand All @@ -136,58 +136,58 @@ class IndefiniteObservable {
* value dispatched and passes it to any new subscriber.
*/
class IndefiniteSubject {
constructor() {
this._observers = new Set();
this._hasStarted = false;
}
/**
* Passes the supplied value to any currently-subscribed observers. If an
* observer `subscribe`s before `next` is called again, it will immediately
* receive `value`.
*/
next(value) {
this._hasStarted = true;
this._lastValue = value;
this._observers.forEach((observer) => observer.next(value));
}
/**
* `subscribe` accepts either a function or an object with a next method.
* `subject.next` will forward any value it receives to the function or method
* provided here.
*
* Call the returned `unsubscribe` method to stop receiving values on this
* particular observer.
*/
subscribe(observerOrNext) {
const observer = wrapWithObserver(observerOrNext);
this._observers.add(observer);
if (this._hasStarted) {
observer.next(this._lastValue);
}
return {
unsubscribe: () => {
this._observers.delete(observer);
}
};
}
/**
* Tells other libraries that know about observables that we are one.
*
* https://github.com/tc39/proposal-observable#observable
*/
[$observable]() {
return this;
constructor() {
this._observers = new Set();
this._hasStarted = false;
}
/**
* Passes the supplied value to any currently-subscribed observers. If an
* observer `subscribe`s before `next` is called again, it will immediately
* receive `value`.
*/
next(value) {
this._hasStarted = true;
this._lastValue = value;
this._observers.forEach((observer) => observer.next(value));
}
/**
* `subscribe` accepts either a function or an object with a next method.
* `subject.next` will forward any value it receives to the function or method
* provided here.
*
* Call the returned `unsubscribe` method to stop receiving values on this
* particular observer.
*/
subscribe(observerOrNext) {
const observer = _wrapWithObserver(observerOrNext);
this._observers.add(observer);
if (this._hasStarted) {
observer.next(this._lastValue);
}
return {
unsubscribe: () => {
this._observers.delete(observer);
}
};
}
/**
* Tells other libraries that know about observables that we are one.
*
* https://github.com/tc39/proposal-observable#observable
*/
[$observable]() {
return this;
}
}

function wrapWithObserver(listener) {
if (typeof listener === 'function') {
return {
next: listener
};
}
else {
return listener;
}
function _wrapWithObserver(listener) {
if (typeof listener === 'function') {
return {
next: listener
};
}
else {
return listener;
}
}

0 comments on commit 6e587e3

Please sign in to comment.