Skip to content

Commit

Permalink
Fix path in history.
Browse files Browse the repository at this point in the history
  • Loading branch information
@omegascorp
omegascorp committed Aug 18, 2017
1 parent d87238c commit 1f9622a
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 288 deletions.
266 changes: 0 additions & 266 deletions examples/typescript/todo/dist/index.js
View file
Expand Up @@ -3,276 +3,10 @@ var __extends = (this && this.__extends) || function (d, b) {
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var app;
(function (app) {
var AppView = (function (_super) {
__extends(AppView, _super);
function AppView() {
_super.call(this, {
el: document.querySelector('html')
});
// update links to data-element
// and update special events (submit, focus, blur)
this.update();
}
AppView.prototype.showMain = function (view) {
this.elements.main.style.display = 'block';
this.elements.error.style.display = 'none';
this.elements.main.innerHTML = '';
this.elements.main.appendChild(view.getEl());
};
AppView.prototype.showError = function () {
this.elements.main.style.display = 'none';
this.elements.error.style.display = 'block';
};
return AppView;
}(owl.View));
app.AppView = AppView;
})(app || (app = {}));
var app;
(function (app) {
var MainRouter = (function (_super) {
__extends(MainRouter, _super);
function MainRouter() {
var routes = [{
path: '',
controller: app.TodoController
}, {
path: 'item/:id',
callback: function () {
console.log('user');
}
}], defaultRoute = {
callback: function () {
console.log('404 page');
}
};
_super.call(this, routes, defaultRoute);
}
return MainRouter;
}(owl.Router));
app.MainRouter = MainRouter;
})(app || (app = {}));
var app;
(function (app) {
var TodoController = (function (_super) {
__extends(TodoController, _super);
function TodoController() {
_super.call(this);
this.appView = owl.require('appView');
}
TodoController.prototype.init = function () {
var _this = this;
this.todoItemCollection = new app.TodoItemCollection();
this.todoItemCollection.fetch()
.then(function () {
_this.showTodoView();
});
};
TodoController.prototype.destroy = function () {
this.todoItemCollection.off();
};
TodoController.prototype.showTodoView = function () {
var todoView = new app.TodoView({
controller: this,
collection: this.todoItemCollection
});
this.appView.showMain(todoView);
};
TodoController.prototype.addItem = function (title) {
var _this = this;
var todoItem = new app.TodoItemModel({
title: title,
isDone: false
});
todoItem.save().then(function () {
_this.todoItemCollection.fetch();
});
};
TodoController.prototype.setDone = function (index, isDone) {
this.todoItemCollection.get(index).patch({
isDone: isDone
});
};
return TodoController;
}(owl.Controller));
app.TodoController = TodoController;
})(app || (app = {}));
var app;
(function (app) {
var TodoItemModel = (function (_super) {
__extends(TodoItemModel, _super);
function TodoItemModel(data, options) {
_super.call(this, data, {
urlRoot: 'todo/items',
collection: options && options.collection,
collectionIndex: options && options.collectionIndex
});
}
return TodoItemModel;
}(owl.Model));
app.TodoItemModel = TodoItemModel;
})(app || (app = {}));
var app;
(function (app) {
var TodoItemCollection = (function (_super) {
__extends(TodoItemCollection, _super);
function TodoItemCollection(data) {
_super.call(this, data, {
url: 'todo/items',
model: app.TodoItemModel
});
}
return TodoItemCollection;
}(owl.Collection));
app.TodoItemCollection = TodoItemCollection;
})(app || (app = {}));
var app;
(function (app) {
var TodoView = (function (_super) {
__extends(TodoView, _super);
function TodoView(options) {
_super.call(this, {
className: 'v-todo',
// you can use any template engine here
template: function () {
return ('<form>' +
'<h1>Todo list</h1>' +
'<input type="text" data-element="title" placeholder="Add a task" />' +
'<div data-element="counter" class="v-todo--counter"></div>' +
'</form>' +
'<div data-element="items"></div>' +
'<div data-element="count"></div>');
},
events: {
'keyup $title': 'keyup',
'submit form': 'submit'
},
collection: options.collection,
controller: options.controller
});
this.templateCount = function (data) {
return ('<div class="v-todo--count">' +
data.countLeft + ' items left' +
'</div>');
};
// update links to data-element
// and update special events (submit, focus, blur)
this.render();
this.initListeners();
}
TodoView.prototype.render = function () {
this.el.innerHTML = this.template();
this.update();
this.renderItems();
this.renderCount();
};
TodoView.prototype.renderItems = function () {
var _this = this;
var items = this.collection.getModels();
this.elements.items.innerHTML = '';
items.forEach(function (model) {
var todoItemView = new app.TodoItemView({
model: model,
controller: _this.controller
});
_this.elements.items.appendChild(todoItemView.getEl());
});
};
TodoView.prototype.renderCount = function () {
var countLeft = 0;
this.collection.getModels().forEach(function (model) {
if (!model.get('isDone')) {
countLeft++;
}
});
this.elements.count.innerHTML = this.templateCount({
countLeft: countLeft
});
};
TodoView.prototype.initListeners = function () {
var _this = this;
this.collection.on('change', function () {
_this.renderItems();
_this.renderCount();
});
};
TodoView.prototype.submit = function (element, event) {
var title;
event.preventDefault();
title = this.elements.title.value;
this.controller.addItem(title);
this.elements.title.value = '';
};
TodoView.prototype.keyup = function (element) {
this.elements.counter.innerHTML = element.value.length.toString() || '';
};
;
return TodoView;
}(owl.View));
app.TodoView = TodoView;
})(app || (app = {}));
var app;
(function (app) {
var TodoItemView = (function (_super) {
__extends(TodoItemView, _super);
function TodoItemView(options) {
_super.call(this, {
className: 'v-todo',
// you can use any template engine here
template: function (data) {
return ('<label class="checkbox">' +
'<input data-element="checkbox" type="checkbox" ' + (data.isDone ? 'checked="checked"' : '') + ' />' +
'<span>' + data.title + '</span>' +
'</label>');
},
events: {
'change $checkbox': 'change'
},
model: options.model,
controller: options.controller
});
// update links to data-element
// and update special events (submit, focus, blur)
this.render();
this.initListeners();
}
TodoItemView.prototype.render = function () {
this.el.innerHTML = this.template(this.model.getData());
this.update();
};
;
TodoItemView.prototype.change = function (element, event) {
event.preventDefault();
this.controller.setDone(this.model.getCollectionIndex(), element.checked);
};
;
TodoItemView.prototype.initListeners = function () {
var _this = this;
this.model.on('change', function () {
_this.render();
});
};
;
return TodoItemView;
}(owl.View));
app.TodoItemView = TodoItemView;
})(app || (app = {}));
///<reference path="../../../../typescript/owl.d.ts"/>
///<reference path="AppView.ts"/>
///<reference path="MainRouter.ts"/>
///<reference path="TodoController.ts"/>
///<reference path="TodoItemModel.ts"/>
///<reference path="TodoItemCollection.ts"/>
///<reference path="TodoView.ts"/>
///<reference path="TodoItemView.ts"/>
document.addEventListener('DOMContentLoaded', function () {
owl.define('appView', function () {
return new app.AppView();
});
owl.history.init({
baseUrl: '/typescript/todo/'
});
owl.history.setDefaultRouter(new app.MainRouter());
owl.history.start();
});
30 changes: 20 additions & 10 deletions examples/webpack/todo/dist/index.js
View file
Expand Up @@ -159,7 +159,10 @@
* @return {string}
*/
getLocation: function () {
return window.location.pathname.replace(_options.baseUrl + _options.basePath, '').replace(/\/$/, '');
return window.location.pathname
.replace(_options.baseUrl + _options.basePath, '')
.replace(/\/$/, '')
.replace(/^\//, '');
},
/**
* Gets current hash
Expand Down Expand Up @@ -494,7 +497,7 @@
resolve: function(route) {
var resolves = route.resolves || [];
return owl.Promise.all(resolves.map(function (resolve) {
const callback = owl.history.getResolve(resolve);
var callback = owl.history.getResolve(resolve);
if (callback) {
return owl.Promise.resolve(callback());
} else {
Expand Down Expand Up @@ -727,7 +730,7 @@
data: this.data
})
.then(function(result) {
const data = result.data;
var data = result.data;
if(data[that.idAttribute]) {
that.data[that.idAttribute] = data[that.idAttribute];
}
Expand Down Expand Up @@ -802,12 +805,6 @@
*/
Model.prototype.destroy = function(query) {
var that = this;
var id = this.data[this.idAttribute];
if (!id) {
return new Promise(function(resolve, reject) {
reject(new Error('Can not destroy model without id'));
});
}
return owl.ajax.request({
url: this.getEndpointUrl() + owl.ajax.toQueryString(query),
type: 'DELETE'
Expand Down Expand Up @@ -1070,7 +1067,7 @@
return;
}

response.headers = xhr.responseHeaders;
response.headers = that.parseHeaders(xhr);
response.status = xhr.status;

settings.success && settings.success(response);
Expand All @@ -1096,6 +1093,19 @@
xhr.send(body);
});
},
parseHeaders: function(xhr) {
var headersString = xhr.getAllResponseHeaders(),
headers = {};
headersString.split('\n').forEach(function (item) {
var parts;
if (item.trim() === '') {
return;
}
parts = item.split(':');
headers[parts[0].trim()] = parts[1].trim();
});
return headers;
},
/**
* Sets a header for each request
* @param {string} key
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "owljs",
"version": "0.8.22",
"version": "0.8.23",
"description": "Backbone-like frontend library",
"main": "index.js",
"typings": "typescript/owl.d.ts",
Expand Down

0 comments on commit 1f9622a

Please sign in to comment.