Merge pull request #447 from vector-im/skindex-nextgen

Update skindexing for new world order

package.json

@@ -9,8 +9,9 @@
   },
   "license": "Apache-2.0",
   "style": "bundle.css",
+  "matrix-react-parent": "matrix-react-sdk",
   "scripts": {
-    "reskindex": "reskindex vector -h src/skins/vector/header",
+    "reskindex": "reskindex -h src/header",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
     "build:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/bundle.css -c uglifycss --no-watch",
     "build:compile": "babel --source-maps -d lib src",

src/component-index.js

@@ -0,0 +1,48 @@
+/*
+Copyright 2015 OpenMarket Ltd
+
+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.
+*/
+
+/*
+ * THIS FILE IS AUTO-GENERATED
+ * You can edit it you like, but your changes will be overwritten,
+ * so you'd just be trying to swim upstream like a salmon.
+ * You are not a salmon.
+ */
+
+module.exports.components = require('matrix-react-sdk/lib/component-index').components;
+
+module.exports.components['views.elements.ImageView'] = require('./components/views/elements/ImageView');
+module.exports.components['views.elements.Spinner'] = require('./components/views/elements/Spinner');
+module.exports.components['views.messages.MessageTimestamp'] = require('./components/views/messages/MessageTimestamp');
+module.exports.components['views.rooms.RoomDNDView'] = require('./components/views/rooms/RoomDNDView');
+
+// Old, unported Vector views:
+module.exports.components['molecules.BottomLeftMenu'] = require('./skins/vector/views/molecules/BottomLeftMenu');
+module.exports.components['molecules.BottomLeftMenuTile'] = require('./skins/vector/views/molecules/BottomLeftMenuTile');
+module.exports.components['molecules.DateSeparator'] = require('./skins/vector/views/molecules/DateSeparator');
+module.exports.components['molecules.MatrixToolbar'] = require('./skins/vector/views/molecules/MatrixToolbar');
+module.exports.components['molecules.MessageContextMenu'] = require('./skins/vector/views/molecules/MessageContextMenu');
+module.exports.components['molecules.RoomCreate'] = require('./skins/vector/views/molecules/RoomCreate');
+module.exports.components['molecules.RoomDropTarget'] = require('./skins/vector/views/molecules/RoomDropTarget');
+module.exports.components['molecules.RoomTooltip'] = require('./skins/vector/views/molecules/RoomTooltip');
+module.exports.components['molecules.SearchBar'] = require('./skins/vector/views/molecules/SearchBar');
+module.exports.components['molecules.SenderProfile'] = require('./skins/vector/views/molecules/SenderProfile');
+module.exports.components['organisms.LeftPanel'] = require('./skins/vector/views/organisms/LeftPanel');
+module.exports.components['organisms.Notifier'] = require('./skins/vector/views/organisms/Notifier');
+module.exports.components['organisms.RightPanel'] = require('./skins/vector/views/organisms/RightPanel');
+module.exports.components['organisms.RoomDirectory'] = require('./skins/vector/views/organisms/RoomDirectory');
+module.exports.components['organisms.RoomSubList'] = require('./skins/vector/views/organisms/RoomSubList');
+module.exports.components['organisms.ViewSource'] = require('./skins/vector/views/organisms/ViewSource');
+module.exports.components['pages.CompatibilityPage'] = require('./skins/vector/views/pages/CompatibilityPage');

src/components/views/rooms/RoomDNDView.js

@@ -201,4 +201,6 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
         // You can ask the monitor about the current drag state:
         isDragging: monitor.isDragging()
     };
-})(RoomTile));
+})(RoomTile));
+
+module.exports.replaces = 'RoomTile';

src/vector/index.js

@@ -20,7 +20,7 @@ var RunModernizrTests = require("./modernizr"); // this side-effects a global
 var React = require("react");
 var ReactDOM = require("react-dom");
 var sdk = require("matrix-react-sdk");
-sdk.loadSkin(require('../skins/vector/skindex'));
+sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
 var configJson = require("../../config.json");