Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<!-- Libraries loaded from CDN -->
<script src="https://cdn.jsdelivr.net/npm/underscore@1.13.7/underscore-min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/react@0.12.2/dist/react-with-addons.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/react-router@0.11.6/dist/react-router.min.js"></script>
<script src="https://cdn.firebase.com/js/client/1.1.3/firebase.js"></script>
<script src="https://cdn.jsdelivr.net/npm/reactfire@0.4.0/dist/reactfire.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css">
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"firebase": "^12.9.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"react-router": "^7.13.0",
"reactfire": "^4.2.3",
"underscore": "^1.13.7"
},
Expand Down
57 changes: 30 additions & 27 deletions script.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ var nextTypes = {
text: 'text'
};

function getHashParams() {
var hash = window.location.hash.replace(/^#\/?/, '');
var parts = hash ? hash.split('/') : [];
return {
scriptId: parts[0] || null,
action: parts[1] || null
};
}

var StopPropagationMixin = {
stopProp: function(event) {
event.nativeEvent.stopImmediatePropagation();
Expand Down Expand Up @@ -66,13 +75,13 @@ function guid() {


var Script = React.createClass({
mixins: [ReactFireMixin, ReactRouter.State],
mixins: [ReactFireMixin],
getInitialState: function() {
highlight = '';

var params = getHashParams();
return {
scriptId: this.getParams().scriptId,
action: this.getParams().action,
scriptId: params.scriptId,
action: params.action,
script: {},
editing: {}
};
Expand All @@ -85,7 +94,7 @@ var Script = React.createClass({
},
loadScript: function() {
if (this.firebaseRefs.script) this.unbind('script');
this.bindAsObject(new Firebase("https://screenwrite.firebaseio.com/"+this.getParams().scriptId), "script");
this.bindAsObject(new Firebase("https://screenwrite.firebaseio.com/"+getHashParams().scriptId), "script");
// CLEANUP OLD DATA
var fb = new Firebase("https://screenwrite.firebaseio.com/"+this.state.scriptId);
fb.once('value', (function(snapshot){
Expand Down Expand Up @@ -262,12 +271,12 @@ var Script = React.createClass({
var highlight = '';

var Line = React.createClass({
mixins: [ReactFireMixin, StopPropagationMixin, ReactRouter.State],
mixins: [ReactFireMixin, StopPropagationMixin],
getInitialState: function() {
return {
comments: this.props.line.comments,
commenting: false,
scriptId: this.getParams().scriptId,
scriptId: getHashParams().scriptId,
focused: false,
};
},
Expand Down Expand Up @@ -441,12 +450,12 @@ var ContentEditable = React.createClass({
});

var Nav = React.createClass({
mixins: [ReactFireMixin, StopPropagationMixin, ReactRouter.State],
mixins: [ReactFireMixin, StopPropagationMixin],
getInitialState: function() {
return {
open: null,
script: {},
scriptId: this.getParams().scriptId,
scriptId: getHashParams().scriptId,
highlight: ''
};
},
Expand Down Expand Up @@ -602,7 +611,7 @@ var Home = React.createClass({
<p>
<a className="btn btn-primary" onClick={this.newScript}><i className="glyphicon glyphicon-plus"></i> New Script</a>
&nbsp;
<Link className="btn btn-primary" to="/demo">Demo Script</Link>
<a className="btn btn-primary" href="#/demo">Demo Script</a>
</p>

<p>
Expand Down Expand Up @@ -635,23 +644,17 @@ var Home = React.createClass({

var App = React.createClass({
render: function() {
return <RouteHandler />;
var params = getHashParams();
if (params.scriptId) {
return <Script />;
}
return <Home />;
}
});

Route = ReactRouter.Route;
Link = ReactRouter.Link;
RouteHandler = ReactRouter.RouteHandler;
DefaultRoute = ReactRouter.DefaultRoute;
var routes = (
<Route handler={App}>
<DefaultRoute handler={Home} />
<Route name="script" path="/:scriptId" handler={Script} />
<Route name="scriptAction" path="/:scriptId/:action" handler={Script} />
</Route>
);


ReactRouter.run(routes, function (Handler) {
React.render(<Handler/>, document.getElementById('container'));
});
function renderApp() {
React.render(<App />, document.getElementById('container'));
}

window.addEventListener('hashchange', renderApp);
renderApp();