More css tweaking to get IE9 compatibility. Fixes #22

ircanywhere · Mar 5, 2014 · 667c238 · 667c238
1 parent 434e207
commit 667c238
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 78 deletions.
diff --git a/client/css/ie.css b/client/css/ie.css
diff --git a/client/js/controllers/messages.controller.js b/client/js/controllers/messages.controller.js
@@ -58,11 +58,16 @@ App.MessagesController = Ember.ArrayController.extend({
 	}),
 
 	filtered: function() {
-		var tab = this.get('socket.tabs').findBy('selected', true),
-			events = this.get('content'),
+		var tab = this.get('socket.tabs').findBy('selected', true);
+
+		if (!tab) {
+			return Ember.A();
+		}
+
+		var events = this.get('content'),
 			limit = (tab) ? tab.get('messageLimit', 50) : 50,
 			slice = events.length - limit;
-			slice = (slice < 0 || tab.requestedBacklog) ? 0 : slice;
+			slice = (slice < 0 || tab.get('requestedBacklog')) ? 0 : slice;
 
 		var proxy = Ember.ArrayProxy.createWithMixins(Ember.SortableMixin, {
 			content: events,

diff --git a/client/js/views/titlebar.view.js b/client/js/views/titlebar.view.js
@@ -1,6 +1,7 @@
 App.TitlebarView = Ember.View.extend({
 	templateName: 'titlebar',
-	classNames: 'topbar clear',
+	tagName: 'table',
+	classNames: 'topbar',
 
 	didInsertElement: function() {
 		Ember.$(document).on('click', this.documentClick.bind(this));

diff --git a/client/less/app.less b/client/less/app.less
@@ -13,14 +13,18 @@ div.container {
 }
 
 .topbar {
-	display: inline-block;
 	width: 100%;
 	z-index: 6000;
 	font-size: 13px;
 	background: @topbar-bg;
-	.flex;
+	border-spacing: 0;
+	border-collapse: separate;
 	.padding-margin;
 
+	td {
+		padding: 0;
+	}
+
 	&.main {
 		position: fixed;
 
@@ -48,16 +52,12 @@ div.container {
 	}
 
 	.topic-wrap {
-		display: inline-block;
-		padding: 9px;
+		padding: 7px 9px;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		white-space: nowrap;
-		height: 15px;
+		height: 20px;
 		color: @topbar-link;
-		display: inline;
-		line-height: 150%;
-		.setflex(1);
+		line-height: 170%;
 
 		.chan-title,
 		.chan-modes {
@@ -113,7 +113,6 @@ div.container {
 
 	#options-menu {
 		z-index: 6020;
-		width: 160px;
 		list-style-type: none;
 		text-align: right;
 		.padding-margin;

diff --git a/client/less/tabs.less b/client/less/tabs.less
@@ -32,10 +32,13 @@
 		padding: 0;
 		overflow-y: auto;
 		overflow-x: hidden;
-		position: relative;
-		height: 100%;
-		width: 100%;
-		.setflex(1);
+		width: auto;
+		height: auto;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 172px;
+		bottom: 0;
 
 		.overlay-bar {
 			z-index: 20;

diff --git a/client/less/userlist.less b/client/less/userlist.less
@@ -8,6 +8,10 @@
 	overflow-y: auto;
 	overflow-x: hidden;
 	margin-top: 3px;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	right: 0;
 
 	div.members-title {
 		padding: 10px;

diff --git a/client/templates/html/index.html b/client/templates/html/index.html
@@ -8,9 +8,6 @@
 		<script src="/build/ircanywhere.js"></script>
 
 		<link rel="stylesheet" type="text/css" href="/build/ircanywhere.css" />
-		<!--[if lte IE 9]>
-			<link rel="stylesheet" type="text/css" href="/css/ie.css" />
-		<![endif]-->
 	</head>
 	<body>
 	<script type="text/x-handlebars">

diff --git a/client/templates/titlebar.hbs b/client/templates/titlebar.hbs
@@ -1,24 +1,34 @@
-<div class="topic-wrap">
-	<span class="chan-title">{{tab.title}}</span>
-	<span class="chan-modes">{{tab.modes}}</span>
-	<span class="chan-desc">{{ircParse tab.desc tab.networkId}}</span>
-</div>
-<ul id="options-menu">
-	<li class="dropdown"><a href="#" {{action toggleProperty "showMenu"}} class="dropdown-toggle">Options</a>
-		{{#if showMenu}}
-			<ul class="dropdown-menu">
-				{{#if tab.isChannel}}
-					<li><a href="#" {{action setTopic}}>Set Topic</a></li>
-					<li class="divider"></li>
-					<li><a href="#" {{action toggleUsers}}>{{toggleUsersText}}</a></li>
-					<li><a href="#" {{action toggleEvents}}>{{toggleEventsText}}</a></li>
-					<li class="divider"></li>
-					<li><a href="#" {{action toggleCycle}}>{{channelLink}}</a></li>
+<tr>
+	<td>
+		<div class="topic-wrap">
+			<span class="chan-title">{{tab.title}}</span>
+			<span class="chan-modes">{{tab.modes}}</span>
+			<span class="chan-desc">{{ircParse tab.desc tab.networkId}}</span>
+		</div>
+	</td>
+	<td>
+		<ul id="options-menu">
+			<li class="dropdown"><a href="#" {{action toggleProperty "showMenu"}} class="dropdown-toggle">Options</a>
+				{{#if showMenu}}
+					<ul class="dropdown-menu">
+						{{#if tab.isChannel}}
+							<li><a href="#" {{action setTopic}}>Set Topic</a></li>
+							<li class="divider"></li>
+							<li><a href="#" {{action toggleUsers}}>{{toggleUsersText}}</a></li>
+							<li><a href="#" {{action toggleEvents}}>{{toggleEventsText}}</a></li>
+							<li class="divider"></li>
+							<li><a href="#" {{action toggleCycle}}>{{channelLink}}</a></li>
+						{{/if}}
+						<li><a href="#" {{action toggleConnect}}>{{connectionLink}}</a></li>
+					</ul>
 				{{/if}}
-				<li><a href="#" {{action toggleConnect}}>{{connectionLink}}</a></li>
-			</ul>
-		{{/if}}
-	</li>
-	<li><a href="#" {{action closeWindow}}>Close</a></li>
-</ul>
-<div class="topbar inner"></div>
+			</li>
+			<li><a href="#" {{action closeWindow}}>Close</a></li>
+		</ul>
+	</td>
+</tr>
+<tr>
+	<td colspan="2">
+		<div class="topbar inner"></div>
+	</td>
+</tr>
diff --git a/server/commands.js b/server/commands.js
@@ -545,6 +545,10 @@ CommandManager.prototype.close = function(user, client, target, params) {
 	var tab = application.Tabs.sync.findOne({target: target, network: client._id});
 	// get the tab in question
 
+	if (!tab) {
+		return false;
+	}
+
 	if (tab.type === 'channel') {
 		if (tab.active) {
 			ircFactory.send(client._id, 'part', [target]);

diff --git a/server/events.js b/server/events.js
@@ -74,7 +74,7 @@ EventManager.prototype._insert = function(client, message, type, user, force) {
 				}
 			};
 
-		application.Events.sync.insert(output);
+		application.Events.sync.insert(output, {safe: false});
 		// get the prefix, construct an output and insert it
 	});
 }