does.
- contentKey = 'textContent' in document.createElement('div') ?
+ contentKey = 'textContent' in document.documentElement ?
'textContent' :
'innerText';
}
@@ -17199,7 +18446,7 @@ function getTextContentAccessor() {
module.exports = getTextContentAccessor;
-},{"./ExecutionEnvironment":21}],122:[function(_dereq_,module,exports){
+},{"./ExecutionEnvironment":22}],130:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17246,7 +18493,7 @@ function getUnboundedScrollPosition(scrollable) {
module.exports = getUnboundedScrollPosition;
-},{}],123:[function(_dereq_,module,exports){
+},{}],131:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17274,6 +18521,9 @@ var _uppercasePattern = /([A-Z])/g;
* > hyphenate('backgroundColor')
* < "background-color"
*
+ * For CSS style names, use `hyphenateStyleName` instead which works properly
+ * with all vendor prefixes, including `ms`.
+ *
* @param {string} string
* @return {string}
*/
@@ -17283,7 +18533,55 @@ function hyphenate(string) {
module.exports = hyphenate;
-},{}],124:[function(_dereq_,module,exports){
+},{}],132:[function(_dereq_,module,exports){
+/**
+ * Copyright 2013-2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule hyphenateStyleName
+ * @typechecks
+ */
+
+"use strict";
+
+var hyphenate = _dereq_("./hyphenate");
+
+var msPattern = /^ms-/;
+
+/**
+ * Hyphenates a camelcased CSS property name, for example:
+ *
+ * > hyphenate('backgroundColor')
+ * < "background-color"
+ * > hyphenate('MozTransition')
+ * < "-moz-transition"
+ * > hyphenate('msTransition')
+ * < "-ms-transition"
+ *
+ * As Modernizr suggests (http://modernizr.com/docs/#prefixed), an `ms` prefix
+ * is converted to `-ms-`.
+ *
+ * @param {string} string
+ * @return {string}
+ */
+function hyphenateStyleName(string) {
+ return hyphenate(string).replace(msPattern, '-ms-');
+}
+
+module.exports = hyphenateStyleName;
+
+},{"./hyphenate":131}],133:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17305,7 +18603,7 @@ module.exports = hyphenate;
"use strict";
-var warning = _dereq_("./warning");
+var invariant = _dereq_("./invariant");
/**
* Validate a `componentDescriptor`. This should be exposed publicly in a follow
@@ -17316,10 +18614,10 @@ var warning = _dereq_("./warning");
*/
function isValidComponentDescriptor(descriptor) {
return (
- typeof descriptor.constructor === 'function' &&
- typeof descriptor.constructor.prototype.construct === 'function' &&
- typeof descriptor.constructor.prototype.mountComponent === 'function' &&
- typeof descriptor.constructor.prototype.receiveComponent === 'function'
+ descriptor &&
+ typeof descriptor.type === 'function' &&
+ typeof descriptor.type.prototype.mountComponent === 'function' &&
+ typeof descriptor.type.prototype.receiveComponent === 'function'
);
}
@@ -17333,29 +18631,21 @@ function isValidComponentDescriptor(descriptor) {
* @protected
*/
function instantiateReactComponent(descriptor) {
- if ("production" !== "development") {
- ("production" !== "development" ? warning(
+
+ // TODO: Make warning
+ // if (__DEV__) {
+ ("production" !== "development" ? invariant(
isValidComponentDescriptor(descriptor),
'Only React Components are valid for mounting.'
- ) : null);
- // We use the clone of a composite component instead of the original
- // instance. This allows us to warn you if you're are accessing the wrong
- // instance.
- var instance = descriptor.__realComponentInstance || descriptor;
- instance._descriptor = descriptor;
- return instance;
- }
- // In prod we don't clone, we simply use the same instance for unaffected
- // behavior. We have to keep the descriptor around for comparison later on.
- // This should ideally be accepted in the constructor of the instance but
- // since that is currently overloaded, we just manually attach it here.
- descriptor._descriptor = descriptor;
- return descriptor;
+ ) : invariant(isValidComponentDescriptor(descriptor)));
+ // }
+
+ return new descriptor.type(descriptor);
}
module.exports = instantiateReactComponent;
-},{"./warning":148}],125:[function(_dereq_,module,exports){
+},{"./invariant":134}],134:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17387,39 +18677,37 @@ module.exports = instantiateReactComponent;
* will remain to ensure logic does not differ in production.
*/
-var invariant = function(condition) {
+var invariant = function(condition, format, a, b, c, d, e, f) {
+ if ("production" !== "development") {
+ if (format === undefined) {
+ throw new Error('invariant requires an error message argument');
+ }
+ }
+
if (!condition) {
- var error = new Error(
- 'Minified exception occured; use the non-minified dev environment for ' +
- 'the full error message and additional helpful warnings.'
- );
- error.framesToPop = 1;
+ var error;
+ if (format === undefined) {
+ error = new Error(
+ 'Minified exception occurred; use the non-minified dev environment ' +
+ 'for the full error message and additional helpful warnings.'
+ );
+ } else {
+ var args = [a, b, c, d, e, f];
+ var argIndex = 0;
+ error = new Error(
+ 'Invariant Violation: ' +
+ format.replace(/%s/g, function() { return args[argIndex++]; })
+ );
+ }
+
+ error.framesToPop = 1; // we don't care about invariant's own frame
throw error;
}
};
-if ("production" !== "development") {
- invariant = function(condition, format, a, b, c, d, e, f) {
- if (format === undefined) {
- throw new Error('invariant requires an error message argument');
- }
-
- if (!condition) {
- var args = [a, b, c, d, e, f];
- var argIndex = 0;
- var error = new Error(
- 'Invariant Violation: ' +
- format.replace(/%s/g, function() { return args[argIndex++]; })
- );
- error.framesToPop = 1; // we don't care about invariant's own frame
- throw error;
- }
- };
-}
-
module.exports = invariant;
-},{}],126:[function(_dereq_,module,exports){
+},{}],135:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17491,7 +18779,7 @@ function isEventSupported(eventNameSuffix, capture) {
module.exports = isEventSupported;
-},{"./ExecutionEnvironment":21}],127:[function(_dereq_,module,exports){
+},{"./ExecutionEnvironment":22}],136:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17526,7 +18814,7 @@ function isNode(object) {
module.exports = isNode;
-},{}],128:[function(_dereq_,module,exports){
+},{}],137:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17577,7 +18865,7 @@ function isTextInputElement(elem) {
module.exports = isTextInputElement;
-},{}],129:[function(_dereq_,module,exports){
+},{}],138:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17609,7 +18897,7 @@ function isTextNode(object) {
module.exports = isTextNode;
-},{"./isNode":127}],130:[function(_dereq_,module,exports){
+},{"./isNode":136}],139:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17655,7 +18943,7 @@ function joinClasses(className/*, ... */) {
module.exports = joinClasses;
-},{}],131:[function(_dereq_,module,exports){
+},{}],140:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17715,7 +19003,7 @@ var keyMirror = function(obj) {
module.exports = keyMirror;
-},{"./invariant":125}],132:[function(_dereq_,module,exports){
+},{"./invariant":134}],141:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17758,7 +19046,61 @@ var keyOf = function(oneKeyObj) {
module.exports = keyOf;
-},{}],133:[function(_dereq_,module,exports){
+},{}],142:[function(_dereq_,module,exports){
+/**
+ * Copyright 2013-2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule mapObject
+ */
+
+"use strict";
+
+/**
+ * For each key/value pair, invokes callback func and constructs a resulting
+ * object which contains, for every key in obj, values that are the result of
+ * of invoking the function:
+ *
+ * func(value, key, iteration)
+ *
+ * Grepable names:
+ *
+ * function objectMap()
+ * function objMap()
+ *
+ * @param {?object} obj Object to map keys over
+ * @param {function} func Invoked for each key/val pair.
+ * @param {?*} context
+ * @return {?object} Result of mapping or null if obj is falsey
+ */
+function mapObject(obj, func, context) {
+ if (!obj) {
+ return null;
+ }
+ var i = 0;
+ var ret = {};
+ for (var key in obj) {
+ if (obj.hasOwnProperty(key)) {
+ ret[key] = func.call(context, obj[key], key, i++);
+ }
+ }
+ return ret;
+}
+
+module.exports = mapObject;
+
+},{}],143:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17799,7 +19141,7 @@ function memoizeStringOnly(callback) {
module.exports = memoizeStringOnly;
-},{}],134:[function(_dereq_,module,exports){
+},{}],144:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17838,7 +19180,7 @@ var merge = function(one, two) {
module.exports = merge;
-},{"./mergeInto":136}],135:[function(_dereq_,module,exports){
+},{"./mergeInto":146}],145:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -17933,6 +19275,17 @@ var mergeHelpers = {
) : invariant(!isTerminal(arg) && !Array.isArray(arg)));
},
+ /**
+ * @param {*} arg
+ */
+ checkMergeIntoObjectArg: function(arg) {
+ ("production" !== "development" ? invariant(
+ (!isTerminal(arg) || typeof arg === 'function') && !Array.isArray(arg),
+ 'Tried to merge into an object, instead got %s.',
+ arg
+ ) : invariant((!isTerminal(arg) || typeof arg === 'function') && !Array.isArray(arg)));
+ },
+
/**
* Checks that a merge was not given a circular object or an object that had
* too great of depth.
@@ -17976,7 +19329,7 @@ var mergeHelpers = {
module.exports = mergeHelpers;
-},{"./invariant":125,"./keyMirror":131}],136:[function(_dereq_,module,exports){
+},{"./invariant":134,"./keyMirror":140}],146:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -18001,15 +19354,16 @@ module.exports = mergeHelpers;
var mergeHelpers = _dereq_("./mergeHelpers");
var checkMergeObjectArg = mergeHelpers.checkMergeObjectArg;
+var checkMergeIntoObjectArg = mergeHelpers.checkMergeIntoObjectArg;
/**
* Shallow merges two structures by mutating the first parameter.
*
- * @param {object} one Object to be merged into.
+ * @param {object|function} one Object to be merged into.
* @param {?object} two Optional object with properties to merge from.
*/
function mergeInto(one, two) {
- checkMergeObjectArg(one);
+ checkMergeIntoObjectArg(one);
if (two != null) {
checkMergeObjectArg(two);
for (var key in two) {
@@ -18023,7 +19377,7 @@ function mergeInto(one, two) {
module.exports = mergeInto;
-},{"./mergeHelpers":135}],137:[function(_dereq_,module,exports){
+},{"./mergeHelpers":145}],147:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -18059,7 +19413,7 @@ var mixInto = function(constructor, methodBag) {
module.exports = mixInto;
-},{}],138:[function(_dereq_,module,exports){
+},{}],148:[function(_dereq_,module,exports){
/**
* Copyright 2014 Facebook, Inc.
*
@@ -18098,105 +19452,7 @@ function monitorCodeUse(eventName, data) {
module.exports = monitorCodeUse;
-},{"./invariant":125}],139:[function(_dereq_,module,exports){
-/**
- * Copyright 2013-2014 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @providesModule objMap
- */
-
-"use strict";
-
-/**
- * For each key/value pair, invokes callback func and constructs a resulting
- * object which contains, for every key in obj, values that are the result of
- * of invoking the function:
- *
- * func(value, key, iteration)
- *
- * @param {?object} obj Object to map keys over
- * @param {function} func Invoked for each key/val pair.
- * @param {?*} context
- * @return {?object} Result of mapping or null if obj is falsey
- */
-function objMap(obj, func, context) {
- if (!obj) {
- return null;
- }
- var i = 0;
- var ret = {};
- for (var key in obj) {
- if (obj.hasOwnProperty(key)) {
- ret[key] = func.call(context, obj[key], key, i++);
- }
- }
- return ret;
-}
-
-module.exports = objMap;
-
-},{}],140:[function(_dereq_,module,exports){
-/**
- * Copyright 2013-2014 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @providesModule objMapKeyVal
- */
-
-"use strict";
-
-/**
- * Behaves the same as `objMap` but invokes func with the key first, and value
- * second. Use `objMap` unless you need this special case.
- * Invokes func as:
- *
- * func(key, value, iteration)
- *
- * @param {?object} obj Object to map keys over
- * @param {!function} func Invoked for each key/val pair.
- * @param {?*} context
- * @return {?object} Result of mapping or null if obj is falsey
- */
-function objMapKeyVal(obj, func, context) {
- if (!obj) {
- return null;
- }
- var i = 0;
- var ret = {};
- for (var key in obj) {
- if (obj.hasOwnProperty(key)) {
- ret[key] = func.call(context, key, obj[key], i++);
- }
- }
- return ret;
-}
-
-module.exports = objMapKeyVal;
-
-},{}],141:[function(_dereq_,module,exports){
+},{"./invariant":134}],149:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -18216,7 +19472,7 @@ module.exports = objMapKeyVal;
*/
"use strict";
-var ReactComponent = _dereq_("./ReactComponent");
+var ReactDescriptor = _dereq_("./ReactDescriptor");
var invariant = _dereq_("./invariant");
@@ -18233,15 +19489,50 @@ var invariant = _dereq_("./invariant");
*/
function onlyChild(children) {
("production" !== "development" ? invariant(
- ReactComponent.isValidComponent(children),
+ ReactDescriptor.isValidDescriptor(children),
'onlyChild must be passed a children with exactly one child.'
- ) : invariant(ReactComponent.isValidComponent(children)));
+ ) : invariant(ReactDescriptor.isValidDescriptor(children)));
return children;
}
module.exports = onlyChild;
-},{"./ReactComponent":31,"./invariant":125}],142:[function(_dereq_,module,exports){
+},{"./ReactDescriptor":56,"./invariant":134}],150:[function(_dereq_,module,exports){
+/**
+ * Copyright 2013-2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule performance
+ * @typechecks
+ */
+
+"use strict";
+
+var ExecutionEnvironment = _dereq_("./ExecutionEnvironment");
+
+var performance;
+
+if (ExecutionEnvironment.canUseDOM) {
+ performance =
+ window.performance ||
+ window.msPerformance ||
+ window.webkitPerformance;
+}
+
+module.exports = performance || {};
+
+},{"./ExecutionEnvironment":22}],151:[function(_dereq_,module,exports){
/**
* Copyright 2013-2014 Facebook, Inc.
*
@@ -18258,25 +19549,16 @@ module.exports = onlyChild;
* limitations under the License.
*
* @providesModule performanceNow
- * @typechecks static-only
+ * @typechecks
*/
-"use strict";
-
-var ExecutionEnvironment = _dereq_("./ExecutionEnvironment");
+var performance = _dereq_("./performance");
/**
- * Detect if we can use window.performance.now() and gracefully
- * fallback to Date.now() if it doesn't exist.
- * We need to support Firefox < 15 for now due to Facebook's webdriver
- * infrastructure.
+ * Detect if we can use `window.performance.now()` and gracefully fallback to
+ * `Date.now()` if it doesn't exist. We need to support Firefox < 15 for now
+ * because of Facebook's testing infrastructure.
*/
-var performance = null;
-
-if (ExecutionEnvironment.canUseDOM) {
- performance = window.performance || window.webkitPerformance;
-}
-
if (!performance || !performance.now) {
performance = Date;
}
@@ -18285,7 +19567,94 @@ var performanceNow = performance.now.bind(performance);
module.exports = performanceNow;
-},{"./ExecutionEnvironment":21}],143:[function(_dereq_,module,exports){
+},{"./performance":150}],152:[function(_dereq_,module,exports){
+/**
+ * Copyright 2013-2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @providesModule setInnerHTML
+ */
+
+"use strict";
+
+var ExecutionEnvironment = _dereq_("./ExecutionEnvironment");
+
+/**
+ * Set the innerHTML property of a node, ensuring that whitespace is preserved
+ * even in IE8.
+ *
+ * @param {DOMElement} node
+ * @param {string} html
+ * @internal
+ */
+var setInnerHTML = function(node, html) {
+ node.innerHTML = html;
+};
+
+if (ExecutionEnvironment.canUseDOM) {
+ // IE8: When updating a just created node with innerHTML only leading
+ // whitespace is removed. When updating an existing node with innerHTML
+ // whitespace in root TextNodes is also collapsed.
+ // @see quirksmode.org/bugreports/archives/2004/11/innerhtml_and_t.html
+
+ // Feature detection; only IE8 is known to behave improperly like this.
+ var testElement = document.createElement('div');
+ testElement.innerHTML = ' ';
+ if (testElement.innerHTML === '') {
+ setInnerHTML = function(node, html) {
+ // Magic theory: IE8 supposedly differentiates between added and updated
+ // nodes when processing innerHTML, innerHTML on updated nodes suffers
+ // from worse whitespace behavior. Re-adding a node like this triggers
+ // the initial and more favorable whitespace behavior.
+ // TODO: What to do on a detached node?
+ if (node.parentNode) {
+ node.parentNode.replaceChild(node, node);
+ }
+
+ // We also implement a workaround for non-visible tags disappearing into
+ // thin air on IE8, this only happens if there is no visible text
+ // in-front of the non-visible tags. Piggyback on the whitespace fix
+ // and simply check if any non-visible tags appear in the source.
+ if (html.match(/^[ \r\n\t\f]/) ||
+ html[0] === '<' && (
+ html.indexOf('
-
+
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index 11233ec4038e..c6bab1e99ccd 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -42,14 +42,14 @@ loop.webapp = (function($, _, OT, webL10n) {
render: function() {
if (this.props.helper.isFirefox(navigator.userAgent)) {
- return React.DOM.div(null );
+ return React.DOM.div(null);
}
return (
- React.DOM.div( {className:"promote-firefox"},
- React.DOM.h3(null, __("promote_firefox_hello_heading")),
+ React.DOM.div({className: "promote-firefox"},
+ React.DOM.h3(null, __("promote_firefox_hello_heading")),
React.DOM.p(null,
- React.DOM.a( {className:"btn btn-large btn-success",
- href:"https://www.mozilla.org/firefox/"},
+ React.DOM.a({className: "btn btn-large btn-success",
+ href: "https://www.mozilla.org/firefox/"},
__("get_firefox_button")
)
)
@@ -69,13 +69,13 @@ loop.webapp = (function($, _, OT, webL10n) {
render: function() {
/* jshint ignore:start */
return (
- React.DOM.div( {className:"expired-url-info"},
- React.DOM.div( {className:"info-panel"},
- React.DOM.div( {className:"firefox-logo"} ),
- React.DOM.h1(null, __("call_url_unavailable_notification_heading")),
+ React.DOM.div({className: "expired-url-info"},
+ React.DOM.div({className: "info-panel"},
+ React.DOM.div({className: "firefox-logo"}),
+ React.DOM.h1(null, __("call_url_unavailable_notification_heading")),
React.DOM.h4(null, __("call_url_unavailable_notification_message"))
- ),
- PromoteFirefoxView( {helper:this.props.helper} )
+ ),
+ PromoteFirefoxView({helper: this.props.helper})
)
);
/* jshint ignore:end */
@@ -100,15 +100,15 @@ loop.webapp = (function($, _, OT, webL10n) {
return (
/* jshint ignore:start */
- React.DOM.header( {className:"container-box"},
- React.DOM.h1( {className:"light-weight-font"},
+ React.DOM.header({className: "container-box"},
+ React.DOM.h1({className: "light-weight-font"},
React.DOM.strong(null, __("brandShortname")), " ", __("clientShortname")
- ),
- React.DOM.div( {className:"loop-logo", title:"Firefox WebRTC! logo"}),
- React.DOM.h3( {className:"call-url"},
+ ),
+ React.DOM.div({className: "loop-logo", title: "Firefox WebRTC! logo"}),
+ React.DOM.h3({className: "call-url"},
conversationUrl
- ),
- React.DOM.h4( {className:urlCreationDateClasses} ,
+ ),
+ React.DOM.h4({className: urlCreationDateClasses},
callUrlCreationDateString
)
)
@@ -120,8 +120,8 @@ loop.webapp = (function($, _, OT, webL10n) {
var ConversationFooter = React.createClass({displayName: 'ConversationFooter',
render: function() {
return (
- React.DOM.div( {className:"footer container-box"},
- React.DOM.div( {title:"Mozilla Logo", className:"footer-logo"})
+ React.DOM.div({className: "footer container-box"},
+ React.DOM.div({title: "Mozilla Logo", className: "footer-logo"})
)
);
}
@@ -217,34 +217,34 @@ loop.webapp = (function($, _, OT, webL10n) {
return (
/* jshint ignore:start */
- React.DOM.div( {className:"container"},
- React.DOM.div( {className:"container-box"},
+ React.DOM.div({className: "container"},
+ React.DOM.div({className: "container-box"},
- ConversationHeader(
- {urlCreationDateString:this.state.urlCreationDateString} ),
+ ConversationHeader({
+ urlCreationDateString: this.state.urlCreationDateString}),
- React.DOM.p( {className:"large-font light-weight-font"},
+ React.DOM.p({className: "large-font light-weight-font"},
__("initiate_call_button_label")
- ),
+ ),
- React.DOM.div( {id:"messages"}),
+ React.DOM.div({id: "messages"}),
- React.DOM.div( {className:"button-group"},
- React.DOM.div( {className:"flex-padding-1"}),
- React.DOM.button( {ref:"submitButton", onClick:this._initiate,
- className:callButtonClasses,
- disabled:this.state.disableCallButton},
- __("initiate_call_button"),
- React.DOM.i( {className:"icon icon-video"})
- ),
- React.DOM.div( {className:"flex-padding-1"})
- ),
+ React.DOM.div({className: "button-group"},
+ React.DOM.div({className: "flex-padding-1"}),
+ React.DOM.button({ref: "submitButton", onClick: this._initiate,
+ className: callButtonClasses,
+ disabled: this.state.disableCallButton},
+ __("initiate_call_button"),
+ React.DOM.i({className: "icon icon-video"})
+ ),
+ React.DOM.div({className: "flex-padding-1"})
+ ),
- React.DOM.p( {className:"terms-service",
- dangerouslySetInnerHTML:{__html: tosHTML}})
- ),
+ React.DOM.p({className: "terms-service",
+ dangerouslySetInnerHTML: {__html: tosHTML}})
+ ),
- ConversationFooter(null )
+ ConversationFooter(null)
)
/* jshint ignore:end */
);
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 86e7acb8903d..cf78c2101a74 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -159,7 +159,7 @@ describe("loop.conversation", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWith(router.loadReactComponent,
sinon.match(function(value) {
- return TestUtils.isComponentOfType(value,
+ return TestUtils.isDescriptorOfType(value,
loop.conversation.IncomingCallView);
}));
});
@@ -207,7 +207,7 @@ describe("loop.conversation", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWith(router.loadReactComponent,
sinon.match(function(value) {
- return TestUtils.isComponentOfType(value,
+ return TestUtils.isDescriptorOfType(value,
loop.shared.views.ConversationView);
}));
});
@@ -273,7 +273,7 @@ describe("loop.conversation", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWith(router.loadReactComponent,
sinon.match(function(value) {
- return TestUtils.isComponentOfType(value,
+ return TestUtils.isDescriptorOfType(value,
loop.shared.views.FeedbackView);
}));
});
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 9f5d6076ab42..7d48376d7395 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -16,7 +16,7 @@
-
+
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 13f526f2c173..2a3637c32490 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -110,7 +110,7 @@ describe("loop.panel", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWithExactly(router.loadReactComponent,
sinon.match(function(value) {
- return React.addons.TestUtils.isComponentOfType(
+ return React.addons.TestUtils.isDescriptorOfType(
value, loop.panel.PanelView);
}));
});
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index d0518ff18ff8..c3492cf03c30 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -16,7 +16,7 @@
-
+
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index 79e5fc3eb819..93eb1cec6cf6 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -16,7 +16,7 @@
-
+
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index c1f51167076e..1aee0a4f4fb4 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -149,7 +149,7 @@ describe("loop.webapp", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWith(router.loadReactComponent,
sinon.match(function(value) {
- return React.addons.TestUtils.isComponentOfType(
+ return React.addons.TestUtils.isDescriptorOfType(
value, loop.webapp.CallUrlExpiredView);
}));
});
@@ -168,7 +168,7 @@ describe("loop.webapp", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWithExactly(router.loadReactComponent,
sinon.match(function(value) {
- return React.addons.TestUtils.isComponentOfType(
+ return React.addons.TestUtils.isDescriptorOfType(
value, loop.webapp.ConversationFormView);
}));
});
@@ -193,7 +193,7 @@ describe("loop.webapp", function() {
sinon.assert.calledOnce(router.loadReactComponent);
sinon.assert.calledWith(router.loadReactComponent,
sinon.match(function(value) {
- return React.addons.TestUtils.isComponentOfType(
+ return React.addons.TestUtils.isDescriptorOfType(
value, loop.shared.views.ConversationView);
}));
});
diff --git a/browser/components/loop/ui/ui-showcase.js b/browser/components/loop/ui/ui-showcase.js
index b952b61b3f14..be2cc442b9dd 100644
--- a/browser/components/loop/ui/ui-showcase.js
+++ b/browser/components/loop/ui/ui-showcase.js
@@ -44,10 +44,10 @@
render: function() {
var cx = React.addons.classSet;
return (
- React.DOM.div( {className:"example"},
- React.DOM.h3(null, this.props.summary),
- React.DOM.div( {className:cx({comp: true, dashed: this.props.dashed}),
- style:this.props.style || {}},
+ React.DOM.div({className: "example"},
+ React.DOM.h3(null, this.props.summary),
+ React.DOM.div({className: cx({comp: true, dashed: this.props.dashed}),
+ style: this.props.style || {}},
this.props.children
)
)
@@ -58,8 +58,8 @@
var Section = React.createClass({displayName: 'Section',
render: function() {
return (
- React.DOM.section( {id:this.props.name},
- React.DOM.h1(null, this.props.name),
+ React.DOM.section({id: this.props.name},
+ React.DOM.h1(null, this.props.name),
this.props.children
)
);
@@ -69,19 +69,19 @@
var ShowCase = React.createClass({displayName: 'ShowCase',
render: function() {
return (
- React.DOM.div( {className:"showcase"},
+ React.DOM.div({className: "showcase"},
React.DOM.header(null,
- React.DOM.h1(null, "Loop UI Components Showcase"),
- React.DOM.nav( {className:"menu"},
+ React.DOM.h1(null, "Loop UI Components Showcase"),
+ React.DOM.nav({className: "menu"},
React.Children.map(this.props.children, function(section) {
return (
- React.DOM.a( {className:"btn btn-info", href:"#" + section.props.name},
+ React.DOM.a({className: "btn btn-info", href: "#" + section.props.name},
section.props.name
)
);
})
)
- ),
+ ),
this.props.children
)
);
@@ -92,58 +92,58 @@
render: function() {
return (
ShowCase(null,
- Section( {name:"PanelView"},
- Example( {summary:"332px wide", dashed:"true", style:{width: "332px"}},
- PanelView(null )
+ Section({name: "PanelView"},
+ Example({summary: "332px wide", dashed: "true", style: {width: "332px"}},
+ PanelView(null)
)
- ),
+ ),
- Section( {name:"IncomingCallView"},
- Example( {summary:"Default", dashed:"true", style:{width: "280px"}},
- IncomingCallView(null )
+ Section({name: "IncomingCallView"},
+ Example({summary: "Default", dashed: "true", style: {width: "280px"}},
+ IncomingCallView(null)
)
- ),
+ ),
- Section( {name:"ConversationToolbar"},
- Example( {summary:"Default"},
- ConversationToolbar( {video:{enabled: true}, audio:{enabled: true}} )
- ),
- Example( {summary:"Video muted"},
- ConversationToolbar( {video:{enabled: false}, audio:{enabled: true}} )
- ),
- Example( {summary:"Audio muted"},
- ConversationToolbar( {video:{enabled: true}, audio:{enabled: false}} )
+ Section({name: "ConversationToolbar"},
+ Example({summary: "Default"},
+ ConversationToolbar({video: {enabled: true}, audio: {enabled: true}})
+ ),
+ Example({summary: "Video muted"},
+ ConversationToolbar({video: {enabled: false}, audio: {enabled: true}})
+ ),
+ Example({summary: "Audio muted"},
+ ConversationToolbar({video: {enabled: true}, audio: {enabled: false}})
)
- ),
+ ),
- Section( {name:"ConversationView"},
- Example( {summary:"Default"},
- ConversationView( {video:{enabled: true}, audio:{enabled: true}} )
+ Section({name: "ConversationView"},
+ Example({summary: "Default"},
+ ConversationView({video: {enabled: true}, audio: {enabled: true}})
)
- ),
+ ),
- Section( {name:"FeedbackView"},
- React.DOM.p( {className:"note"},
- React.DOM.strong(null, "Note:"), " For the useable demo, you can access submitted data at ",
- React.DOM.a( {href:"https://input.allizom.org/"}, "input.allizom.org"),"."
- ),
- Example( {summary:"Default (useable demo)", dashed:"true", style:{width: "280px"}},
- FeedbackView( {feedbackApiClient:stageFeedbackApiClient} )
- ),
- Example( {summary:"Detailed form", dashed:"true", style:{width: "280px"}},
- FeedbackView( {step:"form"} )
- ),
- Example( {summary:"Thank you!", dashed:"true", style:{width: "280px"}},
- FeedbackView( {step:"finished"} )
+ Section({name: "FeedbackView"},
+ React.DOM.p({className: "note"},
+ React.DOM.strong(null, "Note:"), " For the useable demo, you can access submitted data at ",
+ React.DOM.a({href: "https://input.allizom.org/"}, "input.allizom.org"), "."
+ ),
+ Example({summary: "Default (useable demo)", dashed: "true", style: {width: "280px"}},
+ FeedbackView({feedbackApiClient: stageFeedbackApiClient})
+ ),
+ Example({summary: "Detailed form", dashed: "true", style: {width: "280px"}},
+ FeedbackView({step: "form"})
+ ),
+ Example({summary: "Thank you!", dashed: "true", style: {width: "280px"}},
+ FeedbackView({step: "finished"})
)
- ),
+ ),
- Section( {name:"CallUrlExpiredView"},
- Example( {summary:"Firefox User"},
- CallUrlExpiredView( {helper:{isFirefox: returnTrue}} )
- ),
- Example( {summary:"Non-Firefox User"},
- CallUrlExpiredView( {helper:{isFirefox: returnFalse}} )
+ Section({name: "CallUrlExpiredView"},
+ Example({summary: "Firefox User"},
+ CallUrlExpiredView({helper: {isFirefox: returnTrue}})
+ ),
+ Example({summary: "Non-Firefox User"},
+ CallUrlExpiredView({helper: {isFirefox: returnFalse}})
)
)
)
@@ -152,6 +152,6 @@
});
window.addEventListener("DOMContentLoaded", function() {
- React.renderComponent(App(null ), document.body);
+ React.renderComponent(App(null), document.body);
});
})();