From cddfdc88afa1741a9b47e8fd97633fce26af8027 Mon Sep 17 00:00:00 2001 From: Paul Meskers Date: Thu, 8 Jan 2015 11:25:14 -0500 Subject: [PATCH] fix(react-ribbon): rename ribbon component to inline ribbon Signed-off-by: Da Lu --- src/pivotal-ui/components/ribbons.scss | 6 +++--- src/pivotal-ui/javascripts/components.js | 2 +- src/pivotal-ui/javascripts/ribbons.jsx | 4 ++-- test/spec/javascripts/ribbon_spec.jsx | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pivotal-ui/components/ribbons.scss b/src/pivotal-ui/components/ribbons.scss index b7d0524ff..6d86ea073 100644 --- a/src/pivotal-ui/components/ribbons.scss +++ b/src/pivotal-ui/components/ribbons.scss @@ -149,16 +149,16 @@ categories: - Beta --- ```html_example -
+
``` ```jsx_example React.render(
- British + British
, - document.getElementById('ribbon-example') + document.getElementById('Inline-ribbon-example') ); ``` diff --git a/src/pivotal-ui/javascripts/components.js b/src/pivotal-ui/javascripts/components.js index 4bc515e61..c9b994f95 100644 --- a/src/pivotal-ui/javascripts/components.js +++ b/src/pivotal-ui/javascripts/components.js @@ -61,7 +61,7 @@ module.exports = { Image: require('./images.jsx').Image, - Ribbon: require('./ribbons.jsx').Ribbon, + InlineRibbon: require('./ribbons.jsx').InlineRibbon, Tab: require('./tabs.jsx').Tab, SimpleTabs: require('./tabs.jsx').SimpleTabs, diff --git a/src/pivotal-ui/javascripts/ribbons.jsx b/src/pivotal-ui/javascripts/ribbons.jsx index 0f5527033..601105a78 100644 --- a/src/pivotal-ui/javascripts/ribbons.jsx +++ b/src/pivotal-ui/javascripts/ribbons.jsx @@ -3,7 +3,7 @@ var React = require('react/addons'); -var Ribbon = React.createClass({ +var InlineRibbon = React.createClass({ render: function() { return (
@@ -16,7 +16,7 @@ var Ribbon = React.createClass({ module.exports = { - Ribbon: Ribbon + InlineRibbon: InlineRibbon }; diff --git a/test/spec/javascripts/ribbon_spec.jsx b/test/spec/javascripts/ribbon_spec.jsx index 5aafb15e2..84287de54 100644 --- a/test/spec/javascripts/ribbon_spec.jsx +++ b/test/spec/javascripts/ribbon_spec.jsx @@ -4,14 +4,14 @@ var $ = require('jquery'); var React = require('react/addons'); var TestUtils = React.addons.TestUtils; -var Ribbon = require('../../../src/pivotal-ui/javascripts/ribbons.jsx').Ribbon; +var InlineRibbon = require('../../../src/pivotal-ui/javascripts/ribbons.jsx').InlineRibbon; -describe('Ribbon', function() { +describe('InlineRibbon', function() { beforeEach(function() { this.node = $('
').appendTo('body').get(0); React.render( - British, this.node + British, this.node ); }); afterEach(function() { @@ -20,7 +20,7 @@ describe('Ribbon', function() { }); - it("renders a ribbon", function() { + it("renders a inline ribbon", function() { expect($('#container .inline-ribbon')).toHaveText('British'); }); });