Download:
child 271:a015d1dba5cd
parent 269:81a5a7fa0f5f
270:eea4a3f6b615
Anton Shestakov <av6@dwimlabs.net>, Sat, 17 Dec 2016 17:59:14 +0800
index: flex message area, reserve some height

5 файлов изменено, 20 вставок(+), 14 удалений(-) [+]
coffee/messages.coffee file | annotate | diff | comparison | revisions
css/tram-im.css file | annotate | diff | comparison | revisions
index.html file | annotate | diff | comparison | revisions
js/messages.js file | annotate | diff | comparison | revisions
js/messages.js.map file | annotate | diff | comparison | revisions
--- a/coffee/messages.coffee Sat Dec 17 17:54:15 2016 +0800
+++ b/coffee/messages.coffee Sat Dec 17 17:59:14 2016 +0800
@@ -112,10 +112,10 @@
@scroll()
bottomed: ->
- @$log.scrollTop() + @$log.height() == @$log.get(0).scrollHeight
+ @$el.scrollTop() + @$el.innerHeight() == @el.scrollHeight
scroll: ->
- @$log.scrollTop(@$log.get(0).scrollHeight)
+ @$el.scrollTop(@el.scrollHeight)
remove: ->
@rivet.unbind()
--- a/css/tram-im.css Sat Dec 17 17:54:15 2016 +0800
+++ b/css/tram-im.css Sat Dec 17 17:59:14 2016 +0800
@@ -61,12 +61,6 @@
.uk-grid.main-grid > * {
padding: 0 15px;
}
-.log {
- height: 300px;
- overflow: auto;
- margin-top: 15px;
- margin-bottom: 15px;
-}
.uk-form.input-group {
display: table;
margin-bottom: 15px;
@@ -85,6 +79,18 @@
border-top: 1px solid #ddd;
margin: 10px 0;
}
+.message-area {
+ height: 300px;
+ overflow-y: hidden;
+ margin: 0 -15px 15px -15px;
+}
+.chat {
+ height: 100%;
+ overflow-y: auto;
+}
+.log {
+ padding: 15px 15px 0 15px;
+}
.message .presence {
color: darkmagenta;
}
--- a/index.html Sat Dec 17 17:54:15 2016 +0800
+++ b/index.html Sat Dec 17 17:59:14 2016 +0800
@@ -141,9 +141,9 @@
</div>
</div>
- <div class="uk-width-xlarge-3-4 uk-width-large-2-3 uk-width-medium-1-2">
- <div data-app="logs"></div>
- <div class="uk-form input-group uk-hidden" data-form="send">
+ <div class="uk-width-xlarge-3-4 uk-width-large-2-3 uk-width-medium-1-2 uk-flex uk-flex-column">
+ <div class="uk-flex-item-auto message-area" data-app="logs"></div>
+ <div class="uk-form uk-flex-item-none input-group uk-hidden" data-form="send">
<input id="msg" type="text" value="" placeholder="send a message" required>
<span class="input-group-button">
<button class="uk-button uk-button-primary" data-send-button>
--- a/js/messages.js Sat Dec 17 17:54:15 2016 +0800
+++ b/js/messages.js Sat Dec 17 17:59:14 2016 +0800
@@ -188,11 +188,11 @@
};
LogApp.prototype.bottomed = function() {
- return this.$log.scrollTop() + this.$log.height() === this.$log.get(0).scrollHeight;
+ return this.$el.scrollTop() + this.$el.innerHeight() === this.el.scrollHeight;
};
LogApp.prototype.scroll = function() {
- return this.$log.scrollTop(this.$log.get(0).scrollHeight);
+ return this.$el.scrollTop(this.el.scrollHeight);
};
LogApp.prototype.remove = function() {
--- a/js/messages.js.map Sat Dec 17 17:54:15 2016 +0800
+++ b/js/messages.js.map Sat Dec 17 17:59:14 2016 +0800
@@ -6,5 +6,5 @@
"coffee/messages.coffee"
],
"names": [],
- "mappings": ";AAAA;AAAA,MAAA;;;EAAM,IAAI,CAAC;;;;;;;sBACT,QAAA,GAAU,SAAA;aACR;QAAA,KAAA,EAAW,IAAA,IAAA,CAAA,CAAX;;IADQ;;sBAGV,UAAA,GAAY,SAAA;aACV,IAAC,CAAA,EAAD,CAAI,kBAAJ,EAAwB,SAAA;eACtB,IAAC,CAAA,GAAD,CAAK,UAAL,EAAiB,MAAA,CAAO,IAAC,CAAA,GAAD,CAAK,OAAL,CAAP,CAAjB;MADsB,CAAxB;IADU;;;;KAJa,QAAQ,CAAC;;EAS9B,IAAI,CAAC;;;;;;;uBACT,KAAA,GAAO,IAAI,CAAC;;uBACZ,cAAA,GAAgB,EAAA,GAAK,EAAL,GAAU;;uBAC1B,aAAA,GAAe,EAAA,GAAK;;uBAEpB,UAAA,GAAY,SAAC,KAAD;aACV,KAAK,CAAC,GAAN,CAAU,OAAV,CAAkB,CAAC,OAAnB,CAAA;IADU;;uBAGZ,UAAA,GAAY,SAAA;aACV,IAAC,CAAA,EAAD,CAAI,KAAJ,EAAW,IAAC,CAAA,KAAZ;IADU;;uBAGZ,KAAA,GAAO,SAAC,KAAD;AACL,UAAA;MAAA,EAAA,GAAK,IAAC,CAAA,OAAD,CAAS,KAAT;MAEL,IAAA,GAAO,IAAC,CAAA,MAAO,CAAA,EAAA,GAAK,CAAL;MACf,IAAC,CAAA,YAAD,CAAc,IAAd,EAAoB,KAApB;MAEA,IAAA,GAAO,IAAC,CAAA,MAAO,CAAA,EAAA,GAAK,CAAL;aACf,IAAC,CAAA,YAAD,CAAc,KAAd,EAAqB,IAArB;IAPK;;uBASP,YAAA,GAAc,SAAC,EAAD,EAAK,EAAL;MACZ,IAAO,UAAP;AACE,eADF;;MAGA,IAAO,UAAP;QACE,EAAE,CAAC,KAAH,CAAS,SAAT;QACA,EAAE,CAAC,KAAH,CAAS,QAAT;AACA,eAHF;;MAKA,IAAG,IAAC,CAAA,WAAD,CAAa,EAAb,EAAiB,EAAjB,CAAH;eACE,EAAE,CAAC,GAAH,CAAO,SAAP,EAAkB,IAAlB,EADF;OAAA,MAAA;QAGE,EAAE,CAAC,KAAH,CAAS,SAAT;QAEA,IAAG,IAAC,CAAA,SAAD,CAAW,EAAX,EAAe,EAAf,CAAH;iBACE,EAAE,CAAC,GAAH,CAAO,QAAP,EAAiB,IAAjB,EADF;SAAA,MAAA;iBAGE,EAAE,CAAC,KAAH,CAAS,QAAT,EAHF;SALF;;IATY;;uBAmBd,WAAA,GAAa,SAAC,EAAD,EAAK,EAAL;aACX,IAAI,CAAC,GAAL,CAAS,EAAE,CAAC,GAAH,CAAO,OAAP,CAAe,CAAC,OAAhB,CAAA,CAAA,GAA4B,EAAE,CAAC,GAAH,CAAO,OAAP,CAAe,CAAC,OAAhB,CAAA,CAArC,CAAA,GAAkE,IAAC,CAAA;IADxD;;uBAGb,SAAA,GAAW,SAAC,EAAD,EAAK,EAAL;aAET,EAAE,CAAC,GAAH,CAAO,MAAP,CAAA,KAAkB,EAAE,CAAC,GAAH,CAAO,MAAP,CAAlB,IAAqC,IAAI,CAAC,GAAL,CAAS,EAAE,CAAC,GAAH,CAAO,OAAP,CAAe,CAAC,OAAhB,CAAA,CAAA,GAA4B,EAAE,CAAC,GAAH,CAAO,OAAP,CAAe,CAAC,OAAhB,CAAA,CAArC,CAAA,GAAkE,IAAC,CAAA;IAF/F;;;;KA1Ce,QAAQ,CAAC;;EA+C/B,IAAI,CAAC;;;;;;;0BACT,UAAA,GAAY,CAAA,CAAE,CAAA,CAAE,mBAAF,CAAsB,CAAC,IAAvB,CAAA,CAAF;;0BAEZ,UAAA,GAAY,SAAA;MACV,IAAC,CAAA,UAAD,CAAY,IAAC,CAAA,UAAU,CAAC,KAAZ,CAAA,CAAZ;MACA,IAAC,CAAA,aAAD,GAAiB,IAAC,CAAA,CAAD,CAAG,gBAAH;aAEjB,IAAC,CAAA,IAAD,CAAA;IAJU;;0BAMZ,IAAA,GAAM,SAAA;aACJ,IAAC,CAAA,QAAD,CAAU,IAAC,CAAA,KAAX,EAAkB,gBAAlB,EAAoC,IAAC,CAAA,aAArC;IADI;;0BAGN,aAAA,GAAe,SAAA;MACb,IAAO,wCAAJ,IAAoC,mCAAvC;QACE,IAAC,CAAA,EAAD,GAAU,IAAA,IAAI,CAAC,UAAL,CAAgB;UAAA,KAAA,EAAO,OAAP;SAAhB;eACV,IAAC,CAAA,aAAa,CAAC,OAAf,CAAuB,IAAC,CAAA,EAAE,CAAC,MAAJ,CAAA,CAAY,CAAC,EAApC,EAFF;;IADa;;0BAKf,MAAA,GAAQ,SAAC,KAAD;AACN,UAAA;MAAA,IAAC,CAAA,KAAD,GAAS,MAAM,CAAC,IAAP,CAAY,IAAC,CAAA,EAAb,EAAiB;QAAA,OAAA,EAAS,IAAC,CAAA,KAAV;QAAiB,IAAA,EAAM,IAAvB;OAAjB;MACT,OAAA,GAAU,IAAC,CAAA,KAAK,CAAC,GAAP,CAAW,SAAX;MACV,IAAG,OAAH;QACE,IAAC,CAAA,EAAD,GAAU,IAAA,IAAI,CAAC,UAAL,CAAgB;UAAA,KAAA,EAAO,OAAP;SAAhB;QACV,IAAC,CAAA,aAAa,CAAC,OAAf,CAAuB,IAAC,CAAA,EAAE,CAAC,MAAJ,CAAA,CAAY,CAAC,EAApC,EAFF;;aAGA;IANM;;0BAQR,MAAA,GAAQ,SAAA;AACN,UAAA;;WAAG,CAAE,MAAL,CAAA;;MACA,IAAC,CAAA,KAAK,CAAC,MAAP,CAAA;aACA,yCAAA,SAAA;IAHM;;;;KAzBqB,QAAQ,CAAC;;EA+BlC,IAAI,CAAC;;;;;;;qBACT,UAAA,GAAY,CAAA,CAAE,CAAA,CAAE,gBAAF,CAAmB,CAAC,IAApB,CAAA,CAAF;;qBAEZ,UAAA,GAAY,SAAA;MACV,IAAC,CAAA,UAAD,CAAY,IAAC,CAAA,UAAU,CAAC,KAAZ,CAAA,CAAZ;MACA,IAAC,CAAA,IAAD,GAAQ,IAAC,CAAA,CAAD,CAAG,MAAH;MACR,IAAC,CAAA,KAAD,GAAS,MAAM,CAAC,IAAP,CAAY,IAAC,CAAA,EAAb,EAAiB;QAAA,KAAA,EAAO,IAAC,CAAA,KAAR;QAAe,IAAA,EAAM,IAArB;OAAjB;aAET,IAAC,CAAA,IAAD,CAAA;IALU;;qBAOZ,IAAA,GAAM,SAAA;aACJ,IAAC,CAAA,QAAD,CAAU,IAAC,CAAA,UAAX,EAAuB,KAAvB,EAA8B,IAAC,CAAA,KAA/B;IADI;;qBAGN,KAAA,GAAO,SAAC,KAAD,EAAQ,UAAR;AACL,UAAA;MAAA,QAAA,GAAW,IAAC,CAAA,QAAD,CAAA;MACX,EAAA,GAAK,UAAU,CAAC,OAAX,CAAmB,KAAnB;MACL,IAAA,GAAW,IAAA,IAAI,CAAC,WAAL,CAAiB;QAAA,KAAA,EAAO,KAAP;OAAjB;MACX,EAAA,GAAK,IAAI,CAAC,MAAL,CAAA,CAAa,CAAC;MACnB,IAAG,EAAA,KAAM,CAAT;QACE,IAAC,CAAA,IAAI,CAAC,OAAN,CAAc,EAAd,EADF;OAAA,MAAA;QAGE,IAAC,CAAA,IAAI,CAAC,QAAN,CAAA,CAAgB,CAAC,EAAjB,CAAoB,EAAA,GAAK,CAAzB,CAA2B,CAAC,KAA5B,CAAkC,EAAlC,EAHF;;MAKA,IAAG,QAAH;eACE,IAAC,CAAA,MAAD,CAAA,EADF;;IAVK;;qBAaP,QAAA,GAAU,SAAA;aACR,IAAC,CAAA,IAAI,CAAC,SAAN,CAAA,CAAA,GAAoB,IAAC,CAAA,IAAI,CAAC,MAAN,CAAA,CAApB,KAAsC,IAAC,CAAA,IAAI,CAAC,GAAN,CAAU,CAAV,CAAY,CAAC;IAD3C;;qBAGV,MAAA,GAAQ,SAAA;aACN,IAAC,CAAA,IAAI,CAAC,SAAN,CAAgB,IAAC,CAAA,IAAI,CAAC,GAAN,CAAU,CAAV,CAAY,CAAC,YAA7B;IADM;;qBAGR,MAAA,GAAQ,SAAA;MACN,IAAC,CAAA,KAAK,CAAC,MAAP,CAAA;aACA,oCAAA,SAAA;IAFM;;;;KAhCgB,QAAQ,CAAC;AAvFnC"
+ "mappings": "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"
}
\ No newline at end of file