From 4a23ae7dc44679f32559719fbaa587c2ae0cfe8d Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Thu, 17 Jan 2013 13:44:18 +0000 Subject: [PATCH] Update JavaScript application files structure Move models views and collection views to various directories --- src/messenger/build.xml | 22 ++++++++++++++----- .../messages_collection.js | 0 .../status_collection.js | 0 .../chat/{views => model_views}/avatar.js | 0 .../{views => model_views}/controls/close.js | 0 .../controls/history.js | 0 .../controls/redirect.js | 0 .../controls/refresh.js | 0 .../controls/secure_mode.js | 0 .../controls/send_mail.js | 0 .../{views => model_views}/controls/sound.js | 0 .../controls/user_name.js | 0 .../messages/message.js | 0 .../messages/message_form.js | 0 .../status/base_status.js | 0 .../{views => model_views}/status/message.js | 0 .../{views => model_views}/status/typing.js | 0 src/messenger/webim/js/compiled/chat_app.js | 4 ++-- .../base_collection.js | 0 .../controls_collection.js | 0 .../default/{views => model_views}/control.js | 0 .../default/{views => model_views}/sound.js | 0 .../webim/js/compiled/default_app.js | 4 ++-- .../messages_collection.js | 0 .../status_collection.js | 0 .../chat/{views => model_views}/avatar.js | 0 .../{views => model_views}/controls/close.js | 0 .../controls/history.js | 0 .../controls/redirect.js | 0 .../controls/refresh.js | 0 .../controls/secure_mode.js | 0 .../controls/send_mail.js | 0 .../{views => model_views}/controls/sound.js | 0 .../controls/user_name.js | 0 .../messages/message.js | 0 .../messages/message_form.js | 0 .../status/base_status.js | 0 .../{views => model_views}/status/message.js | 0 .../{views => model_views}/status/typing.js | 0 .../base_collection.js | 0 .../controls_collection.js | 0 .../default/{views => model_views}/control.js | 0 .../default/{views => model_views}/sound.js | 0 43 files changed, 21 insertions(+), 9 deletions(-) rename src/messenger/webim/js/compiled/chat/{views/messages => collection_views}/messages_collection.js (100%) rename src/messenger/webim/js/compiled/chat/{views/status => collection_views}/status_collection.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/avatar.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/close.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/history.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/redirect.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/refresh.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/secure_mode.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/send_mail.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/sound.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/controls/user_name.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/messages/message.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/messages/message_form.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/status/base_status.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/status/message.js (100%) rename src/messenger/webim/js/compiled/chat/{views => model_views}/status/typing.js (100%) rename src/messenger/webim/js/compiled/default/{views => collection_views}/base_collection.js (100%) rename src/messenger/webim/js/compiled/default/{views => collection_views}/controls_collection.js (100%) rename src/messenger/webim/js/compiled/default/{views => model_views}/control.js (100%) rename src/messenger/webim/js/compiled/default/{views => model_views}/sound.js (100%) rename src/messenger/webim/js/source/chat/{views/messages => collection_views}/messages_collection.js (100%) rename src/messenger/webim/js/source/chat/{views/status => collection_views}/status_collection.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/avatar.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/close.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/history.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/redirect.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/refresh.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/secure_mode.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/send_mail.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/sound.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/controls/user_name.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/messages/message.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/messages/message_form.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/status/base_status.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/status/message.js (100%) rename src/messenger/webim/js/source/chat/{views => model_views}/status/typing.js (100%) rename src/messenger/webim/js/source/default/{views => collection_views}/base_collection.js (100%) rename src/messenger/webim/js/source/default/{views => collection_views}/controls_collection.js (100%) rename src/messenger/webim/js/source/default/{views => model_views}/control.js (100%) rename src/messenger/webim/js/source/default/{views => model_views}/sound.js (100%) diff --git a/src/messenger/build.xml b/src/messenger/build.xml index ba9a6e81..bf5201f1 100644 --- a/src/messenger/build.xml +++ b/src/messenger/build.xml @@ -176,11 +176,21 @@ - - + + - + + + + + + + + + + + @@ -191,7 +201,8 @@ - + + @@ -200,7 +211,8 @@ - + + diff --git a/src/messenger/webim/js/compiled/chat/views/messages/messages_collection.js b/src/messenger/webim/js/compiled/chat/collection_views/messages_collection.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/messages/messages_collection.js rename to src/messenger/webim/js/compiled/chat/collection_views/messages_collection.js diff --git a/src/messenger/webim/js/compiled/chat/views/status/status_collection.js b/src/messenger/webim/js/compiled/chat/collection_views/status_collection.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/status/status_collection.js rename to src/messenger/webim/js/compiled/chat/collection_views/status_collection.js diff --git a/src/messenger/webim/js/compiled/chat/views/avatar.js b/src/messenger/webim/js/compiled/chat/model_views/avatar.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/avatar.js rename to src/messenger/webim/js/compiled/chat/model_views/avatar.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/close.js b/src/messenger/webim/js/compiled/chat/model_views/controls/close.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/close.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/close.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/history.js b/src/messenger/webim/js/compiled/chat/model_views/controls/history.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/history.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/history.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/redirect.js b/src/messenger/webim/js/compiled/chat/model_views/controls/redirect.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/redirect.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/redirect.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/refresh.js b/src/messenger/webim/js/compiled/chat/model_views/controls/refresh.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/refresh.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/refresh.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/secure_mode.js b/src/messenger/webim/js/compiled/chat/model_views/controls/secure_mode.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/secure_mode.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/secure_mode.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/send_mail.js b/src/messenger/webim/js/compiled/chat/model_views/controls/send_mail.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/send_mail.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/send_mail.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/sound.js b/src/messenger/webim/js/compiled/chat/model_views/controls/sound.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/sound.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/sound.js diff --git a/src/messenger/webim/js/compiled/chat/views/controls/user_name.js b/src/messenger/webim/js/compiled/chat/model_views/controls/user_name.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/controls/user_name.js rename to src/messenger/webim/js/compiled/chat/model_views/controls/user_name.js diff --git a/src/messenger/webim/js/compiled/chat/views/messages/message.js b/src/messenger/webim/js/compiled/chat/model_views/messages/message.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/messages/message.js rename to src/messenger/webim/js/compiled/chat/model_views/messages/message.js diff --git a/src/messenger/webim/js/compiled/chat/views/messages/message_form.js b/src/messenger/webim/js/compiled/chat/model_views/messages/message_form.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/messages/message_form.js rename to src/messenger/webim/js/compiled/chat/model_views/messages/message_form.js diff --git a/src/messenger/webim/js/compiled/chat/views/status/base_status.js b/src/messenger/webim/js/compiled/chat/model_views/status/base_status.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/status/base_status.js rename to src/messenger/webim/js/compiled/chat/model_views/status/base_status.js diff --git a/src/messenger/webim/js/compiled/chat/views/status/message.js b/src/messenger/webim/js/compiled/chat/model_views/status/message.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/status/message.js rename to src/messenger/webim/js/compiled/chat/model_views/status/message.js diff --git a/src/messenger/webim/js/compiled/chat/views/status/typing.js b/src/messenger/webim/js/compiled/chat/model_views/status/typing.js similarity index 100% rename from src/messenger/webim/js/compiled/chat/views/status/typing.js rename to src/messenger/webim/js/compiled/chat/model_views/status/typing.js diff --git a/src/messenger/webim/js/compiled/chat_app.js b/src/messenger/webim/js/compiled/chat_app.js index 58c378fb..282b22ab 100644 --- a/src/messenger/webim/js/compiled/chat_app.js +++ b/src/messenger/webim/js/compiled/chat_app.js @@ -43,11 +43,11 @@ a==this.KIND_AGENT?"agent":a==this.KIND_FOR_AGENT?"hidden":a==this.KIND_INFO?"in this.render,this)},serializeData:function(){var a=this.model.toJSON();a.user=b.Objects.Models.user.toJSON();return a},postMessage:function(){var a=this.ui.message.val();""!=a&&(this.disableInput(),this.model.postMessage(a));b.Objects.Collections.messages.on("multiple:add",this.postMessageComplete,this)},messageKeyDown:function(a){var c=a.which;a=a.ctrlKey;(13==c&&(a||this.model.get("ignoreCtrl"))||10==c)&&this.postMessage()},enableInput:function(){this.ui.message.removeAttr("disabled")},disableInput:function(){this.ui.message.attr("disabled", "disabled")},clearInput:function(){this.ui.message.val("").change()},postMessageComplete:function(){this.clearInput();this.enableInput();this.focused&&this.ui.focus();b.Objects.Collections.messages.off("multiple:add",this.postMessageComplete,this)},selectPredefinedAnswer:function(){var a=this.ui.message,c=this.ui.predefinedAnswer,b=c.get(0).selectedIndex;b&&(a.val(this.model.get("predefinedAnswers")[b-1].full).change(),a.focus(),c.get(0).selectedIndex=0)},checkUserTyping:function(){var a=b.Objects.Models.user, c=""!=this.ui.message.val();c!=a.get("typing")&&a.set({typing:c})},setFocus:function(){this.focused=!0},dropFocus:function(){this.focused=!1}})})(Mibew,Backbone,Handlebars); +(function(a,b){a.Views.StatusMessage=a.Views.Status.extend({template:b.templates.status_message})})(Mibew,Handlebars); +(function(a,b){a.Views.StatusTyping=a.Views.Status.extend({template:b.templates.status_typing})})(Mibew,Handlebars); (function(a){a.Views.MessagesCollection=a.Views.CollectionBase.extend({itemView:a.Views.Message,className:"messages-collection",initialize:function(){this.collection.on("multiple:add",this.messagesAdded,this);a.Objects.Models.messageForm.on("before:post",this.messagePost,this)},skipNextSound:!0,messagePost:function(){this.skipNextSound=!0},messagesAdded:function(){if(!this.skipNextSound&&a.Objects.Models.Controls.sound.get("enabled")){var b=a.Objects.Models.page.get("webimRoot");b&&a.Objects.Models.sound.play(b+ "/sounds/new_message.wav")}this.skipNextSound=!1}})})(Mibew); -(function(a,b){a.Views.StatusMessage=a.Views.Status.extend({template:b.templates.status_message})})(Mibew,Handlebars); (function(a){a.Views.StatusCollection=a.Views.CollectionBase.extend({itemView:a.Views.Status,className:"status-collection"})})(Mibew); -(function(a,b){a.Views.StatusTyping=a.Views.Status.extend({template:b.templates.status_typing})})(Mibew,Handlebars); (function(a,b){a.Regions.Messages=b.Marionette.Region.extend({el:"#messages-region",onShow:function(a){a.on("after:item:added",this.scrollToBottom,this)},scrollToBottom:function(){this.$el.scrollTop(this.$el.prop("scrollHeight"))}})})(Mibew,Backbone); (function(a,j,k){var f=new j.Marionette.Application;f.addRegions({controlsRegion:"#controls-region",avatarRegion:"#avatar-region",messagesRegion:a.Regions.Messages,statusRegion:"#status-region",messageFormRegion:"#message-form-region",soundRegion:"#sound-region"});f.addInitializer(function(d){var g=a.Objects,c=a.Objects.Models,b=a.Objects.Models.Controls,h=a.Objects.Models.Status;g.server=new a.Server(k.extend({interactionType:MibewAPIChatInteraction},d.server));g.thread=new a.Thread(d.thread);c.user= new a.Models.User(d.user);c.page=new a.Models.Page(d.page);var e=new a.Collections.Controls;c.user.get("isAgent")||(b.userName=new a.Models.UserNameControl({weight:220}),e.push(b.userName),b.sendMail=new a.Models.SendMailControl({weight:200,link:d.links.mailLink}),e.push(b.sendMail));c.user.get("isAgent")&&(b.redirect=new a.Models.RedirectControl({weight:200,link:d.links.redirectLink}),e.push(b.redirect),b.history=new a.Models.HistoryControl({weight:180,link:d.links.historyLink}),e.push(b.history)); diff --git a/src/messenger/webim/js/compiled/default/views/base_collection.js b/src/messenger/webim/js/compiled/default/collection_views/base_collection.js similarity index 100% rename from src/messenger/webim/js/compiled/default/views/base_collection.js rename to src/messenger/webim/js/compiled/default/collection_views/base_collection.js diff --git a/src/messenger/webim/js/compiled/default/views/controls_collection.js b/src/messenger/webim/js/compiled/default/collection_views/controls_collection.js similarity index 100% rename from src/messenger/webim/js/compiled/default/views/controls_collection.js rename to src/messenger/webim/js/compiled/default/collection_views/controls_collection.js diff --git a/src/messenger/webim/js/compiled/default/views/control.js b/src/messenger/webim/js/compiled/default/model_views/control.js similarity index 100% rename from src/messenger/webim/js/compiled/default/views/control.js rename to src/messenger/webim/js/compiled/default/model_views/control.js diff --git a/src/messenger/webim/js/compiled/default/views/sound.js b/src/messenger/webim/js/compiled/default/model_views/sound.js similarity index 100% rename from src/messenger/webim/js/compiled/default/views/sound.js rename to src/messenger/webim/js/compiled/default/model_views/sound.js diff --git a/src/messenger/webim/js/compiled/default_app.js b/src/messenger/webim/js/compiled/default_app.js index 71355f4e..cdb52642 100644 --- a/src/messenger/webim/js/compiled/default_app.js +++ b/src/messenger/webim/js/compiled/default_app.js @@ -23,8 +23,8 @@ b.Server.prototype.registerFunction=function(a,b){a in this.functions||(this.fun (function(a,b){a.Models.Sound=b.Model.extend({play:function(a){this.set({file:a});this.trigger("sound:play",this)}})})(Mibew,Backbone); (function(a,b){a.Models.User=b.Model.extend({defaults:{isAgent:!1,canPost:!0,typing:!1,name:"",canChangeName:!1,dafaultName:!0}})})(Mibew,Backbone); (function(a,b){a.Collections.Controls=b.Collection.extend({comparator:function(a){return a.get("weight")}})})(Mibew,Backbone); -(function(d,b,e){d.Views.CollectionBase=b.Marionette.CollectionView.extend({itemView:b.Marionette.ItemView,buildItemView:function(a,b,c){c=e.extend({model:a},c);return(a=a.getModelType())&&d.Views[a]?new d.Views[a](c):new b(c)}})})(Mibew,Backbone,_); (function(b,c,d){b.Views.Control=c.Marionette.ItemView.extend({template:d.templates.control,modelEvents:{change:"render"},events:{mouseover:"mouseOver",mouseleave:"mouseLeave"},attributes:function(){var a=[];a.push("control");this.className&&(a.push(this.className),this.className="");var b=this.getDashedControlType();b&&a.push(b);return{"class":a.join(" ")}},mouseOver:function(){var a=this.getDashedControlType();this.$el.addClass("active"+(a?"-"+a:""))},mouseLeave:function(){var a=this.getDashedControlType(); this.$el.removeClass("active"+(a?"-"+a:""))},getDashedControlType:function(){"undefined"==typeof this.dashedControlType&&(this.dashedControlType=b.Utils.toDashFormat(this.model.getModelType())||"");return this.dashedControlType}})})(Mibew,Backbone,Handlebars); -(function(a){a.Views.ControlsCollection=a.Views.CollectionBase.extend({itemView:a.Views.Control,className:"controls-collection"})})(Mibew); (function(a,b,c){a.Views.Sound=b.Marionette.ItemView.extend({template:c.templates.sound,className:"sound-player",modelEvents:{"sound:play":"render"}})})(Mibew,Backbone,Handlebars); +(function(d,b,e){d.Views.CollectionBase=b.Marionette.CollectionView.extend({itemView:b.Marionette.ItemView,buildItemView:function(a,b,c){c=e.extend({model:a},c);return(a=a.getModelType())&&d.Views[a]?new d.Views[a](c):new b(c)}})})(Mibew,Backbone,_); +(function(a){a.Views.ControlsCollection=a.Views.CollectionBase.extend({itemView:a.Views.Control,className:"controls-collection"})})(Mibew); diff --git a/src/messenger/webim/js/source/chat/views/messages/messages_collection.js b/src/messenger/webim/js/source/chat/collection_views/messages_collection.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/messages/messages_collection.js rename to src/messenger/webim/js/source/chat/collection_views/messages_collection.js diff --git a/src/messenger/webim/js/source/chat/views/status/status_collection.js b/src/messenger/webim/js/source/chat/collection_views/status_collection.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/status/status_collection.js rename to src/messenger/webim/js/source/chat/collection_views/status_collection.js diff --git a/src/messenger/webim/js/source/chat/views/avatar.js b/src/messenger/webim/js/source/chat/model_views/avatar.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/avatar.js rename to src/messenger/webim/js/source/chat/model_views/avatar.js diff --git a/src/messenger/webim/js/source/chat/views/controls/close.js b/src/messenger/webim/js/source/chat/model_views/controls/close.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/close.js rename to src/messenger/webim/js/source/chat/model_views/controls/close.js diff --git a/src/messenger/webim/js/source/chat/views/controls/history.js b/src/messenger/webim/js/source/chat/model_views/controls/history.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/history.js rename to src/messenger/webim/js/source/chat/model_views/controls/history.js diff --git a/src/messenger/webim/js/source/chat/views/controls/redirect.js b/src/messenger/webim/js/source/chat/model_views/controls/redirect.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/redirect.js rename to src/messenger/webim/js/source/chat/model_views/controls/redirect.js diff --git a/src/messenger/webim/js/source/chat/views/controls/refresh.js b/src/messenger/webim/js/source/chat/model_views/controls/refresh.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/refresh.js rename to src/messenger/webim/js/source/chat/model_views/controls/refresh.js diff --git a/src/messenger/webim/js/source/chat/views/controls/secure_mode.js b/src/messenger/webim/js/source/chat/model_views/controls/secure_mode.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/secure_mode.js rename to src/messenger/webim/js/source/chat/model_views/controls/secure_mode.js diff --git a/src/messenger/webim/js/source/chat/views/controls/send_mail.js b/src/messenger/webim/js/source/chat/model_views/controls/send_mail.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/send_mail.js rename to src/messenger/webim/js/source/chat/model_views/controls/send_mail.js diff --git a/src/messenger/webim/js/source/chat/views/controls/sound.js b/src/messenger/webim/js/source/chat/model_views/controls/sound.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/sound.js rename to src/messenger/webim/js/source/chat/model_views/controls/sound.js diff --git a/src/messenger/webim/js/source/chat/views/controls/user_name.js b/src/messenger/webim/js/source/chat/model_views/controls/user_name.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/controls/user_name.js rename to src/messenger/webim/js/source/chat/model_views/controls/user_name.js diff --git a/src/messenger/webim/js/source/chat/views/messages/message.js b/src/messenger/webim/js/source/chat/model_views/messages/message.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/messages/message.js rename to src/messenger/webim/js/source/chat/model_views/messages/message.js diff --git a/src/messenger/webim/js/source/chat/views/messages/message_form.js b/src/messenger/webim/js/source/chat/model_views/messages/message_form.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/messages/message_form.js rename to src/messenger/webim/js/source/chat/model_views/messages/message_form.js diff --git a/src/messenger/webim/js/source/chat/views/status/base_status.js b/src/messenger/webim/js/source/chat/model_views/status/base_status.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/status/base_status.js rename to src/messenger/webim/js/source/chat/model_views/status/base_status.js diff --git a/src/messenger/webim/js/source/chat/views/status/message.js b/src/messenger/webim/js/source/chat/model_views/status/message.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/status/message.js rename to src/messenger/webim/js/source/chat/model_views/status/message.js diff --git a/src/messenger/webim/js/source/chat/views/status/typing.js b/src/messenger/webim/js/source/chat/model_views/status/typing.js similarity index 100% rename from src/messenger/webim/js/source/chat/views/status/typing.js rename to src/messenger/webim/js/source/chat/model_views/status/typing.js diff --git a/src/messenger/webim/js/source/default/views/base_collection.js b/src/messenger/webim/js/source/default/collection_views/base_collection.js similarity index 100% rename from src/messenger/webim/js/source/default/views/base_collection.js rename to src/messenger/webim/js/source/default/collection_views/base_collection.js diff --git a/src/messenger/webim/js/source/default/views/controls_collection.js b/src/messenger/webim/js/source/default/collection_views/controls_collection.js similarity index 100% rename from src/messenger/webim/js/source/default/views/controls_collection.js rename to src/messenger/webim/js/source/default/collection_views/controls_collection.js diff --git a/src/messenger/webim/js/source/default/views/control.js b/src/messenger/webim/js/source/default/model_views/control.js similarity index 100% rename from src/messenger/webim/js/source/default/views/control.js rename to src/messenger/webim/js/source/default/model_views/control.js diff --git a/src/messenger/webim/js/source/default/views/sound.js b/src/messenger/webim/js/source/default/model_views/sound.js similarity index 100% rename from src/messenger/webim/js/source/default/views/sound.js rename to src/messenger/webim/js/source/default/model_views/sound.js