Sfoglia il codice sorgente

Tidying

Change-Id: I4d5ecd2970460566b31875105d4f9badeffbb328
Reviewed-on: http://gerrit.dmdirc.com/2485
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.7rc1
Chris Smith 12 anni fa
parent
commit
039fc25fbb
1 ha cambiato i file con 78 aggiunte e 88 eliminazioni
  1. 78
    88
      src/com/dmdirc/addons/ui_web/res/javascript/dmdirc.js

+ 78
- 88
src/com/dmdirc/addons/ui_web/res/javascript/dmdirc.js Vedi File

@@ -7,17 +7,17 @@ var interval;
7 7
 var treeview, nicklist;
8 8
 
9 9
 function dmdirc_start() {
10
-    if (interval != null) {
10
+    if (interval) {
11 11
         clearInterval(interval);
12 12
     }
13 13
 
14 14
     treeview = new Treeview($('#treeview'));
15
-    nicklist = new Nicklist();
15
+    nicklist = new Nicklist($('#nicklist'));
16 16
 
17 17
     setTimeout(doUpdate, 100);
18 18
 }
19 19
 
20
-(function () {
20
+(function() {
21 21
     Treeview = function(element) {
22 22
         this.element = element;
23 23
     }
@@ -63,7 +63,7 @@ function dmdirc_start() {
63 63
                 // Create a new child <ul/> if needed
64 64
                 var children = parentNode.children('ul');
65 65
 
66
-                if (children.length == 0) {
66
+                if (children.length === 0) {
67 67
                     parentNode.append($('<ul/>'));
68 68
                     children = parentNode.children('ul');
69 69
                 }
@@ -91,7 +91,7 @@ function dmdirc_start() {
91 91
         },
92 92
 
93 93
         setactive: function(id) {
94
-            if (activeWindow != null) {
94
+            if (activeWindow) {
95 95
                 document.getElementById(activeWindow).style.fontWeight = 'normal';
96 96
             }
97 97
 
@@ -101,6 +101,45 @@ function dmdirc_start() {
101 101
     });
102 102
 })();
103 103
 
104
+(function() {
105
+    Nicklist = function(element) {
106
+        this.element = element;
107
+    };
108
+
109
+    $.extend(Nicklist.prototype, {
110
+        show: function(window) {
111
+            if (this.element.css('display') !== 'block') {
112
+                document.getElementById('content').style.right = '240px';
113
+                this.element.css('display', 'block');
114
+            }
115
+
116
+            $.ajax('/dynamic/nicklistrefresh', {
117
+                data: {window: window},
118
+                error: errFunc,
119
+                success: handlerFunc
120
+            });
121
+        },
122
+
123
+        clear: function() {
124
+            this.element.empty();
125
+        },
126
+
127
+        add: function(nick) {
128
+            var entry = document.createElement('li');
129
+            entry.innerHTML = nick;
130
+
131
+            this.element.append(entry);
132
+        },
133
+
134
+        hide: function() {
135
+            if (this.element.css('display') === 'block') {
136
+                document.getElementById('content').style.right = '15px';
137
+                this.element.css('display', 'none');
138
+            }
139
+        }
140
+    });
141
+})();
142
+
104 143
 function nsd_show() {
105 144
     if (!enabled) {
106 145
         return;
@@ -127,8 +166,7 @@ function nsd_show() {
127 166
 
128 167
     $('#nsd').load('/static/newserverdialog.html');
129 168
 
130
-    $.ajax('/dynamic/getprofiles',
131
-    {
169
+    $.ajax('/dynamic/getprofiles', {
132 170
         error: errFunc,
133 171
         success: handlerFunc
134 172
     });
@@ -154,8 +192,7 @@ function nsd_ok() {
154 192
         return;
155 193
     }
156 194
 
157
-    $.ajax('/dynamic/newserver',
158
-    {
195
+    $.ajax('/dynamic/newserver', {
159 196
         data: {
160 197
             server: server,
161 198
             port: port,
@@ -187,46 +224,6 @@ function profiles_add(profile) {
187 224
     }
188 225
 }
189 226
 
190
-function Nicklist() {}
191
-
192
-$.extend(Nicklist.prototype, {
193
-    show: function(window) {
194
-        var nicklist = document.getElementById('nicklist');
195
-
196
-        if (nicklist.style.display != 'block') {
197
-            document.getElementById('content').style.right = '240px';
198
-            nicklist.style.display = 'block';
199
-        }
200
-
201
-        $.ajax('/dynamic/nicklistrefresh',
202
-        {
203
-            data: {window: window},
204
-            error: errFunc,
205
-            success: handlerFunc
206
-        });
207
-    },
208
-
209
-    clear: function() {
210
-        $('#nicklist').empty();
211
-    },
212
-
213
-    add: function(nick) {
214
-        var entry = document.createElement('li');
215
-        entry.innerHTML = nick;
216
-
217
-        document.getElementById('nicklist').appendChild(entry);
218
-    },
219
-
220
-    hide: function() {
221
-        var nicklist = document.getElementById('nicklist');
222
-
223
-        if (nicklist.style.display == 'block') {
224
-            document.getElementById('content').style.right = '15px';
225
-            nicklist.style.display = 'none';
226
-        }
227
-    }
228
-});
229
-
230 227
 function inputarea_show() {
231 228
     var ia = document.getElementById('inputarea');
232 229
 
@@ -260,7 +257,7 @@ function input_keydown(e) {
260 257
         keynum = e.which;
261 258
     }
262 259
 
263
-    if (keynum == 13) {
260
+    if (keynum === 13) {
264 261
         keynum = 10;
265 262
     }
266 263
 
@@ -269,9 +266,8 @@ function input_keydown(e) {
269 266
     var alt = e.altKey;
270 267
     var el = document.getElementById('input');
271 268
 
272
-    if (keynum == 10 && !control) {
273
-        $.ajax('/dynamic/input',
274
-        {
269
+    if (keynum === 10 && !control) {
270
+        $.ajax('/dynamic/input', {
275 271
             data: {
276 272
                 input: el.value,
277 273
                 clientID: clientID,
@@ -281,9 +277,8 @@ function input_keydown(e) {
281 277
         });
282 278
 
283 279
         el.value = '';
284
-    } else if (keynum == 9 && !control) {
285
-        $.ajax('/dynamic/tab',
286
-        {
280
+    } else if (keynum === 9 && !control) {
281
+        $.ajax('/dynamic/tab', {
287 282
             data: {
288 283
                 input: el.value,
289 284
                 selstart: el.selectionStart,
@@ -295,10 +290,9 @@ function input_keydown(e) {
295 290
         });
296 291
 
297 292
         return false;
298
-    } else if (keynum == 38 || keynum == 40) {
293
+    } else if (keynum === 38 || keynum === 40) {
299 294
         // up/down
300
-        $.ajax('/dynamic/key' + ((keynum == 38) ? 'up' : 'down'),
301
-        {
295
+        $.ajax('/dynamic/key' + ((keynum === 38) ? 'up' : 'down'), {
302 296
             data: {
303 297
                 input: el.value,
304 298
                 selstart: el.selectionStart,
@@ -310,10 +304,9 @@ function input_keydown(e) {
310 304
         });
311 305
 
312 306
         return false;
313
-    } else if (control && (keynum == 10 || keynum == 66 || keynum == 70 || keynum == 73
314
-        || keynum == 75 || keynum == 79 || keynum == 85)) {
315
-        $.ajax('/dynamic/key',
316
-        {
307
+    } else if (control && (keynum === 10 || keynum === 66 || keynum === 70
308
+               || keynum === 73 || keynum === 75 || keynum === 79 || keynum === 85)) {
309
+        $.ajax('/dynamic/key', {
317 310
             data: {
318 311
                 input: el.value,
319 312
                 selstart: el.selectionStart,
@@ -341,7 +334,7 @@ function input_setcaret(pos) {
341 334
 }
342 335
 
343 336
 function window_clear(id) {
344
-    if (activeWindow == id) {
337
+    if (activeWindow === id) {
345 338
         $('#content').empty();
346 339
     }
347 340
 
@@ -352,7 +345,7 @@ function window_addline(id, line) {
352 345
     var p = document.createElement('p');
353 346
     p.innerHTML = line;
354 347
 
355
-    if (activeWindow == id) {
348
+    if (activeWindow === id) {
356 349
         document.getElementById('content').appendChild(p);
357 350
         var objDiv = document.getElementById('content');
358 351
         objDiv.scrollTop = objDiv.scrollHeight;
@@ -367,8 +360,7 @@ function window_create(window, parent) {
367 360
     windows[window.id].lines = [];
368 361
     window_show(window.id);
369 362
 
370
-    $.ajax('/dynamic/windowrefresh',
371
-    {
363
+    $.ajax('/dynamic/windowrefresh', {
372 364
         data: {window: window.id},
373 365
         error: errFunc,
374 366
         success: handlerFunc
@@ -391,14 +383,14 @@ function window_show(id) {
391 383
 
392 384
     var className = document.getElementById(id).className;
393 385
 
394
-    if (className == 'channel')  {
386
+    if (className === 'channel')  {
395 387
         nicklist.show(activeWindow);
396 388
     } else {
397 389
         nicklist.hide();
398 390
     }
399 391
 
400
-    if (className == 'server' || className == 'channel' || className == 'input'
401
-        || className == 'query') {
392
+    if (className === 'server' || className === 'channel'
393
+        || className === 'input' || className === 'query') {
402 394
         inputarea_show();
403 395
     } else {
404 396
         inputarea_hide();
@@ -410,6 +402,7 @@ function window_show(id) {
410 402
     windows[id].lines.forEach(function(x) {
411 403
         objDiv.appendChild(x);
412 404
     });
405
+
413 406
     objDiv.scrollTop = objDiv.scrollHeight;
414 407
 }
415 408
 
@@ -430,8 +423,7 @@ function link_hyperlink(url) {
430 423
 }
431 424
 
432 425
 function link_channel(channel) {
433
-    $.ajax('/dynamic/joinchannel',
434
-    {
426
+    $.ajax('/dynamic/joinchannel', {
435 427
         data: {
436 428
             clientID: clientID,
437 429
             source: activeWindow,
@@ -442,8 +434,7 @@ function link_channel(channel) {
442 434
 }
443 435
 
444 436
 function link_query(user) {
445
-    $.ajax('/dynamic/openquery',
446
-    {
437
+    $.ajax('/dynamic/openquery', {
447 438
         data: {
448 439
             clientID: clientID,
449 440
             source: activeWindow,
@@ -454,8 +445,7 @@ function link_query(user) {
454 445
 }
455 446
 
456 447
 function doUpdate() {
457
-    $.ajax('/dynamic/feed',
458
-    {
448
+    $.ajax('/dynamic/feed', {
459 449
         data: {clientID: clientID},
460 450
         scriptCharset: 'UTF-8',
461 451
         success: updateHandlerFunc,
@@ -478,29 +468,29 @@ function handlerFunc(data) {
478 468
     for (var i = 0; i < data.length; i++) {
479 469
         var event = data[i];
480 470
 
481
-        if (event.type == 'statusbar') {
471
+        if (event.type === 'statusbar') {
482 472
             statusbar_settext(event.arg1);
483
-        } else if (event.type == 'clearprofiles') {
473
+        } else if (event.type === 'clearprofiles') {
484 474
             profiles_clear();
485
-        } else if (event.type == 'addprofile') {
475
+        } else if (event.type === 'addprofile') {
486 476
             profiles_add(event.arg1);
487
-        } else if (event.type == 'newwindow') {
477
+        } else if (event.type === 'newwindow') {
488 478
             window_create(event.arg1);
489
-        } else if (event.type == 'closewindow') {
479
+        } else if (event.type === 'closewindow') {
490 480
             window_close(event.arg1);
491
-        } else if (event.type == 'newchildwindow') {
481
+        } else if (event.type === 'newchildwindow') {
492 482
             window_create(event.arg1[1], event.arg1[0]);
493
-        } else if (event.type == 'clearwindow') {
483
+        } else if (event.type === 'clearwindow') {
494 484
             window_clear(event.arg1);
495
-        } else if (event.type == 'lineadded') {
485
+        } else if (event.type === 'lineadded') {
496 486
             window_addline(event.arg1.window, event.arg1.message);
497
-        } else if (event.type == 'settext') {
487
+        } else if (event.type === 'settext') {
498 488
             input_settext(event.arg1);
499
-        } else if (event.type == 'clearnicklist') {
489
+        } else if (event.type === 'clearnicklist') {
500 490
             nicklist.clear();
501
-        } else if (event.type == 'addnicklist') {
491
+        } else if (event.type === 'addnicklist') {
502 492
             nicklist.add(event.arg1);
503
-        } else if (event.type == 'setcaret') {
493
+        } else if (event.type === 'setcaret') {
504 494
             input_setcaret(event.arg1);
505 495
         } else {
506 496
             statusbar_settext("Unknown event type: " + event.type);

Loading…
Annulla
Salva