From 380584135185d9d365818049c84a855fb39e7fd3 Mon Sep 17 00:00:00 2001
From: Lewis Liu <develop@lewisl.net>
Date: Sun, 17 Jul 2016 19:32:37 -0700
Subject: [PATCH] Removing duplicate emoji icon component
---
.../questions/components/EmojiIcon.jsx | 18 ------------------
.../metabase/questions/components/Labels.jsx | 2 +-
.../metabase/reference/components/Field.jsx | 8 ++++----
package.json | 1 -
webpack.config.js | 2 +-
5 files changed, 6 insertions(+), 25 deletions(-)
delete mode 100644 frontend/src/metabase/questions/components/EmojiIcon.jsx
diff --git a/frontend/src/metabase/questions/components/EmojiIcon.jsx b/frontend/src/metabase/questions/components/EmojiIcon.jsx
deleted file mode 100644
index 3256aeec840..00000000000
--- a/frontend/src/metabase/questions/components/EmojiIcon.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint "react/prop-types": "warn" */
-import React, { Component, PropTypes } from "react";
-
-import { emoji } from "metabase/lib/emoji";
-
-const EmojiIcon = ({ size = 18, style, className, name }) =>
- <span className={className} style={{ width: size, height: size, ...style }}>
- {emoji[name].react}
- </span>
-
-EmojiIcon.propTypes = {
- className: PropTypes.string,
- style: PropTypes.object,
- size: PropTypes.number,
- name: PropTypes.string.isRequired,
-};
-
-export default EmojiIcon;
diff --git a/frontend/src/metabase/questions/components/Labels.jsx b/frontend/src/metabase/questions/components/Labels.jsx
index 6b0e8431a7a..e14b3d8bc08 100644
--- a/frontend/src/metabase/questions/components/Labels.jsx
+++ b/frontend/src/metabase/questions/components/Labels.jsx
@@ -4,7 +4,7 @@ import { Link } from "react-router";
import S from "./Labels.css";
import color from 'color'
-import EmojiIcon from "./EmojiIcon.jsx"
+import EmojiIcon from "metabase/components/EmojiIcon.jsx"
import cx from "classnames";
diff --git a/frontend/src/metabase/reference/components/Field.jsx b/frontend/src/metabase/reference/components/Field.jsx
index 144e72f4e97..69ce9348fe3 100644
--- a/frontend/src/metabase/reference/components/Field.jsx
+++ b/frontend/src/metabase/reference/components/Field.jsx
@@ -105,10 +105,10 @@ Field.propTypes = {
field: PropTypes.object.isRequired,
foreignKeys: PropTypes.object.isRequired,
url: PropTypes.string.isRequired,
- placeholder: PropTypes.string,
- icon: PropTypes.string,
- isEditing: PropTypes.bool,
- formField: PropTypes.object
+ placeholder: PropTypes.string,
+ icon: PropTypes.string,
+ isEditing: PropTypes.bool,
+ formField: PropTypes.object
};
export default pure(Field);
diff --git a/package.json b/package.json
index 03337163f5c..f8053b754b6 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
"react-ansi-style": "^1.0.0",
"react-dom": "^0.14.7",
"react-draggable": "^1.1.3",
- "react-manhattan": "^0.2.2",
"react-onclickout": "^2.0.4",
"react-redux": "^4.4.0",
"react-resizable": "^1.0.1",
diff --git a/webpack.config.js b/webpack.config.js
index 64581b7ad6b..866a7a869cc 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,7 @@ var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
var ExtractTextPlugin = require('extract-text-webpack-plugin');
var HtmlWebpackPlugin = require('html-webpack-plugin');
var UnusedFilesWebpackPlugin = require("unused-files-webpack-plugin").default;
-// var FlowStatusWebpackPlugin = require('flow-status-webpack-plugin');
+var FlowStatusWebpackPlugin = require('flow-status-webpack-plugin');
var _ = require('underscore');
var glob = require('glob');
--
GitLab