senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commiting result

Browse Source
This commit is contained in:
Senad Uka
2015-01-27 04:20:34 +01:00
parent 8d18695879 8d885694cf
commit 5c9b2f99ee
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front-ui/app/components/items/singleItem.js
View File

@@ -22,8 +22,8 @@ var SingleItem = React.createClass({
itemClick: function(e) { itemClick: function(e) {
// no need for this to go through ItemActions // no need for this to go through ItemActions
//ItemActions.selectItem(this.props.item); ItemActions.selectItem(this.props.item);
this.transitionTo('/artikal/' + this.props.item.get('id') +'/' + this.props.item.get('name')); //this.transitionTo('/artikal/' + this.props.item.get('id') +'/' + this.props.item.get('name'));
} }
}); });

9
front-ui/app/ribica.js
View File

@@ -1,9 +1,14 @@
var Backbone = require('backbone'); var Backbone = require('backbone');
var React = require('react');
var ExternalApi = require('./externalApi'); var ExternalApi = require('./externalApi');
var Routes = require('./routes'); var Router = require('./router');
Backbone.$ = $; Backbone.$ = $;
Router.run(function(Handler, state) {
React.render(<Handler />, document.body);
});
module.exports = { module.exports = {
App: ExternalApi, App: ExternalApi,
Routes: Routes Router: Routes
} }

7
front-ui/app/routes.js → front-ui/app/router.js
View File

@@ -24,6 +24,9 @@ var routes = (
</Route> </Route>
); );
Router.run(routes, function(Handler) { var router = Router.create({
React.render(<Handler />, document.body); routes: routes
//,location: Router.HistoryLocation
}); });
module.exports = router;

9
front-ui/app/stores/itemStore.js
View File

@@ -2,7 +2,7 @@ var AppDispatcher = require('../dispatcher/appDispatcher');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var ItemConstants = require('../constants/itemConstants'); var ItemConstants = require('../constants/itemConstants');
var ItemCollection = require('../models/itemCollection'); var ItemCollection = require('../models/itemCollection');
var ItemWithDetails = require('../models/itemWithDetails') var ItemWithDetails = require('../models/itemWithDetails');
var _ = require('underscore'); var _ = require('underscore');
// Define initial data points // Define initial data points
@@ -63,6 +63,7 @@ var ItemStore = _.extend({}, EventEmitter.prototype, {
}); });
// Register callback with AppDispatcher // Register callback with AppDispatcher
AppDispatcher.register(function(payload) { AppDispatcher.register(function(payload) {
var action = payload.action; var action = payload.action;
@@ -72,7 +73,13 @@ AppDispatcher.register(function(payload) {
// Respond to SELECT_ITEM action // Respond to SELECT_ITEM action
case ItemConstants.SELECT_ITEM: case ItemConstants.SELECT_ITEM:
<<<<<<< HEAD
setSelected(action.item.id); setSelected(action.item.id);
=======
var router = require('../router');
// use this instead: action.item.getFrontEndUrl()
router.transitionTo('/artikal/' + action.item.get('id') +'/' + action.item.get('name'));
>>>>>>> 8d885694cfe8307d42a9a5201ff5357f57909012
break; break;
case ItemConstants.LOAD_FOR_FRONTPAGE: case ItemConstants.LOAD_FOR_FRONTPAGE: