mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-07-03 01:28:30 +00:00
3.5.84 to 3.5.100. Most importantly, started using new Ember stuff. -view-registry instead of Ember.View.views, and such. Finally added UI for managing pinned channels. Use HTTPS for the API and socket servers. Don't immediately unload chat rooms. Smarter chat tab behavior. Added /card command for opening mod cards. Other stuff.
This commit is contained in:
parent
c167a8b626
commit
800553c602
28 changed files with 1016 additions and 525 deletions
10
src/main.js
10
src/main.js
|
@ -22,7 +22,7 @@ FFZ.get = function() { return FFZ.instance; }
|
|||
|
||||
// Version
|
||||
var VER = FFZ.version_info = {
|
||||
major: 3, minor: 5, revision: 83,
|
||||
major: 3, minor: 5, revision: 100,
|
||||
toString: function() {
|
||||
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
|
||||
}
|
||||
|
@ -333,10 +333,18 @@ FFZ.prototype.init_ember = function(delay) {
|
|||
|
||||
this.users = {};
|
||||
this.is_dashboard = false;
|
||||
|
||||
try {
|
||||
this.embed_in_dash = window.top !== window && /\/[^\/]+\/dashboard/.test(window.top.location.pathname) && !/bookmarks$/.test(window.top.location.pathname);
|
||||
} catch(err) { this.embed_in_dash = false; }
|
||||
|
||||
|
||||
// Make an alias so they STOP RENAMING THIS ON ME
|
||||
var Settings = App.__container__.lookup('controller:settings');
|
||||
if ( Settings && Settings.get('settings') === undefined )
|
||||
Settings.reopen({settings: Ember.computed.alias('model')});
|
||||
|
||||
|
||||
// Initialize all the modules.
|
||||
this.load_settings();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue