diff --git a/clientapp/models/contact.js b/clientapp/models/contact.js index 131354a..2409642 100644 --- a/clientapp/models/contact.js +++ b/clientapp/models/contact.js @@ -2,14 +2,14 @@ "use strict"; var async = require('async'); -var StrictModel = require('strictmodel').Model; +var HumanModel = require('human-model'); var Resources = require('./resources'); var Messages = require('./messages'); var Message = require('./message'); var crypto = XMPP.crypto; -module.exports = StrictModel.extend({ +module.exports = HumanModel.extend({ initialize: function (attrs) { if (attrs.jid) { this.cid = attrs.jid; diff --git a/clientapp/models/me.js b/clientapp/models/me.js index 412f37f..8abc304 100644 --- a/clientapp/models/me.js +++ b/clientapp/models/me.js @@ -1,12 +1,12 @@ /*global app*/ "use strict"; -var StrictModel = require('strictmodel'); +var HumanModel = require('human-model'); var Contacts = require('./contacts'); var Contact = require('./contact'); -module.exports = StrictModel.Model.extend({ +module.exports = HumanModel.extend({ session: { jid: ['string', true, ''], status: ['string', true, ''], diff --git a/clientapp/models/message.js b/clientapp/models/message.js index 8d9d852..05cde6b 100644 --- a/clientapp/models/message.js +++ b/clientapp/models/message.js @@ -1,10 +1,10 @@ /*global me*/ "use strict"; -var StrictModel = require('strictmodel').Model; +var HumanModel = require('human-model'); -module.exports = StrictModel.extend({ +module.exports = HumanModel.extend({ initialize: function (attrs) { this._created = Date.now(); }, diff --git a/clientapp/models/resource.js b/clientapp/models/resource.js index 1d77f99..0f2dd18 100644 --- a/clientapp/models/resource.js +++ b/clientapp/models/resource.js @@ -1,9 +1,9 @@ "use strict"; -var StrictModel = require('strictmodel').Model; +var HumanModel = require('human-model'); -module.exports = StrictModel.extend({ +module.exports = HumanModel.extend({ initialize: function () {}, type: 'resource', session: { diff --git a/clientapp/pages/base.js b/clientapp/pages/base.js index 7a8e555..d4cb047 100644 --- a/clientapp/pages/base.js +++ b/clientapp/pages/base.js @@ -2,10 +2,10 @@ "use strict"; var _ = require('underscore'); -var StrictView = require('strictview'); +var HumanView = require('human-view'); -module.exports = StrictView.extend({ +module.exports = HumanView.extend({ show: function (animation) { var self = this; diff --git a/clientapp/router.js b/clientapp/router.js index 9a1fccb..1bf17e6 100644 --- a/clientapp/router.js +++ b/clientapp/router.js @@ -9,7 +9,7 @@ var ChatPage = require('./pages/chat'); module.exports = Backbone.Router.extend({ routes: { - '': 'signin', + '': 'main', 'signin': 'signin', 'chat/:jid': 'chat' }, diff --git a/clientapp/views/contactListItem.js b/clientapp/views/contactListItem.js index 71a531c..7a97259 100644 --- a/clientapp/views/contactListItem.js +++ b/clientapp/views/contactListItem.js @@ -2,11 +2,11 @@ "use strict"; var _ = require('underscore'); -var StrictView = require('strictview'); +var HumanView = require('human-view'); var templates = require('../templates'); -module.exports = StrictView.extend({ +module.exports = HumanView.extend({ template: templates.includes.contactListItem, classBindings: { show: '', diff --git a/clientapp/views/main.js b/clientapp/views/main.js index a2474b8..c5bd319 100644 --- a/clientapp/views/main.js +++ b/clientapp/views/main.js @@ -1,12 +1,12 @@ /*global $, app, me*/ "use strict"; -var StrictView = require('strictview'); +var HumanView = require('human-view'); var templates = require('../templates'); var ContactListItem = require('../views/contactListItem'); -module.exports = StrictView.extend({ +module.exports = HumanView.extend({ template: templates.body, events: { 'click a[href]': 'handleLinkClick' diff --git a/clientapp/views/message.js b/clientapp/views/message.js index 3d0b232..3a6deec 100644 --- a/clientapp/views/message.js +++ b/clientapp/views/message.js @@ -2,11 +2,11 @@ "use strict"; var _ = require('underscore'); -var StrictView = require('strictview'); +var HumanView = require('human-view'); var templates = require('../templates'); -module.exports = StrictView.extend({ +module.exports = HumanView.extend({ template: templates.includes.message, initialize: function (opts) { this.render(); diff --git a/package.json b/package.json index 309d341..95e22c6 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "node-uuid": "1.4.1", "semi-static": "0.0.4", "sound-effect-manager": "0.0.5", - "strictmodel": "0.1.1", - "strictview": "1.0.2", + "human-model": "0.3.0", + "human-view": "1.1.0", "templatizer": "0.1.2", "underscore": "1.5.1" },