commiting result

front-ui/app/components/items/singleItem.js

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

front-ui/app/ribica.js

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

front-ui/app/router.js

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

front-ui/app/stores/itemStore.js

@@ -2,7 +2,7 @@ var AppDispatcher = require('../dispatcher/appDispatcher');
 var EventEmitter = require('events').EventEmitter;
 var ItemConstants = require('../constants/itemConstants');
 var ItemCollection = require('../models/itemCollection');
-var ItemWithDetails = require('../models/itemWithDetails')
+var ItemWithDetails = require('../models/itemWithDetails');
 var _ = require('underscore');
 
 // Define initial data points
@@ -63,6 +63,7 @@ var ItemStore = _.extend({}, EventEmitter.prototype, {
 
 });
 
+
 // Register callback with AppDispatcher
 AppDispatcher.register(function(payload) {
   var action = payload.action;
@@ -72,7 +73,13 @@ AppDispatcher.register(function(payload) {
 
     // Respond to SELECT_ITEM action
     case ItemConstants.SELECT_ITEM:
+<<<<<<< HEAD
       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;
 
     case ItemConstants.LOAD_FOR_FRONTPAGE: