Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to react 0.14

Browse Source
This commit is contained in:
Matthew Hodgson 2015-11-09 23:13:46 +00:00
parent 6d9817e5e7
commit 87bb7c9b7b
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -28,13 +28,15 @@
"filesize": "^3.1.2", "filesize": "^3.1.2",
"flux": "~2.0.3", "flux": "~2.0.3",
"linkifyjs": "^2.0.0-beta.4", "linkifyjs": "^2.0.0-beta.4",
"modernizr": "^3.1.0",
"matrix-js-sdk": "^0.3.0", "matrix-js-sdk": "^0.3.0",
"matrix-react-sdk": "^0.0.2", "matrix-react-sdk": "^0.0.2",
"modernizr": "^3.1.0",
"q": "^1.4.1", "q": "^1.4.1",
"react": "^0.13.3", "react": "^0.14.2",
"react-dnd": "^2.0.2",
"react-dnd-html5-backend": "^2.0.0",
"react-dom": "^0.14.2",
"react-loader": "^1.4.0", "react-loader": "^1.4.0",
"react-dnd": "^1.1.8",
"sanitize-html": "^1.0.0" "sanitize-html": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {

3
src/ContextualMenu.js
View File

@ -18,6 +18,7 @@ limitations under the License.
'use strict'; 'use strict';
var React = require('react'); var React = require('react');
var ReactDOM = require('react-dom');
// Shamelessly ripped off Modal.js. There's probably a better way // Shamelessly ripped off Modal.js. There's probably a better way
// of doing reusable widgets like dialog boxes & menus where we go and // of doing reusable widgets like dialog boxes & menus where we go and
@ -74,7 +75,7 @@ module.exports = {
</div> </div>
); );
React.render(menu, this.getOrCreateContainer()); ReactDOM.render(menu, this.getOrCreateContainer());
return {close: closeMenu}; return {close: closeMenu};
}, },

4
src/controllers/organisms/RoomList.js
View File

@ -192,8 +192,8 @@ module.exports = {
_repositionTooltip: function(e) { _repositionTooltip: function(e) {
if (this.tooltip && this.tooltip.parentElement) { if (this.tooltip && this.tooltip.parentElement) {
var scroll = this.getDOMNode(); var scroll = this;
this.tooltip.style.top = (scroll.parentElement.offsetTop + this.tooltip.parentElement.offsetTop - scroll.scrollTop) + "px"; this.tooltip.style.top = (scroll.parentElement.offsetTop + this.tooltip.parentElement.offsetTop - this.scrollTop) + "px";
} }
}, },
}; };

2
src/skins/vector/views/organisms/LeftPanel.js
View File

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react'); var React = require('react');
var DragDropContext = require('react-dnd').DragDropContext; var DragDropContext = require('react-dnd').DragDropContext;
var HTML5Backend = require('react-dnd/modules/backends/HTML5'); var HTML5Backend = require('react-dnd-html5-backend');
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');

5
src/vector/index.js
View File

@ -18,6 +18,7 @@ limitations under the License.
var RunModernizrTests = require("./modernizr"); // this side-effects a global var RunModernizrTests = require("./modernizr"); // this side-effects a global
var React = require("react"); var React = require("react");
var ReactDOM = require("react-dom");
var sdk = require("matrix-react-sdk"); var sdk = require("matrix-react-sdk");
sdk.loadSkin(require('../skins/vector/skindex')); sdk.loadSkin(require('../skins/vector/skindex'));
sdk.loadModule(require('../modules/VectorConferenceHandler')); sdk.loadModule(require('../modules/VectorConferenceHandler'));
@ -136,7 +137,7 @@ window.onload = function() {
function loadApp() { function loadApp() {
if (validBrowser) { if (validBrowser) {
var MatrixChat = sdk.getComponent('pages.MatrixChat'); var MatrixChat = sdk.getComponent('pages.MatrixChat');
window.matrixChat = React.render( window.matrixChat = ReactDOM.render(
<MatrixChat onNewScreen={onNewScreen} registrationUrl={makeRegistrationUrl()} />, <MatrixChat onNewScreen={onNewScreen} registrationUrl={makeRegistrationUrl()} />,
document.getElementById('matrixchat') document.getElementById('matrixchat')
); );
@ -145,7 +146,7 @@ function loadApp() {
console.error("Browser is missing required features."); console.error("Browser is missing required features.");
// take to a different landing page to AWOOOOOGA at the user // take to a different landing page to AWOOOOOGA at the user
var CompatibilityPage = require("../skins/vector/views/pages/CompatibilityPage"); var CompatibilityPage = require("../skins/vector/views/pages/CompatibilityPage");
window.matrixChat = React.render( window.matrixChat = ReactDOM.render(
<CompatibilityPage onAccept={function() { <CompatibilityPage onAccept={function() {
validBrowser = true; validBrowser = true;
console.log("User accepts the compatibility risks."); console.log("User accepts the compatibility risks.");