Merge pull request #425 from vector-im/kegan/controller-merging3

Phase 3 controller merging
element-hq · Nov 27, 2015 · 8a58286 · 8a58286
2 parents 054836c + 07001ae
commit 8a58286
Show file tree

Hide file tree

Showing 38 changed files with 52 additions and 2,442 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,6 @@
     "filesize": "^3.1.2",
     "flux": "~2.0.3",
     "gfm.css": "^1.1.1",
-    "highlight.js": "^8.9.1",
     "linkifyjs": "^2.0.0-beta.4",
     "matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop",
     "matrix-react-sdk": "https://github.com/matrix-org/matrix-react-sdk.git#develop",
@@ -38,9 +37,7 @@
     "react-dnd": "^2.0.2",
     "react-dnd-html5-backend": "^2.0.0",
     "react-dom": "^0.14.2",
-    "react-gemini-scrollbar": "^2.0.1",
-    "sanitize-html": "^1.0.0",
-    "velocity-animate": "^1.2.3"
+    "react-gemini-scrollbar": "^2.0.1"
   },
   "devDependencies": {
     "babel": "^5.8.23",

diff --git a/src/ContextualMenu.js b/src/ContextualMenu.js
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
@@ -57,8 +57,8 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var ChangeDisplayName = sdk.getComponent('molecules.ChangeDisplayName');
-        var ChangeAvatar = sdk.getComponent('molecules.ChangeAvatar');
+        var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
+        var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
         return (
             <div className="mx_Login">
                 <div className="mx_Login_box">