From: Cory Chaplin <cory.chaplin@laposte.net>
Date: Mon, 31 Mar 2014 20:47:53 +0000 (+0200)
Subject: Merge remote branch 'origin/development' into text_themes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8fbf9f284eaef116878781dac84cc1de3dcc0782;p=KiwiIRC.git

Merge remote branch 'origin/development' into text_themes

Conflicts:
	client/src/app.js
---

8fbf9f284eaef116878781dac84cc1de3dcc0782
diff --cc client/src/app.js
index b17ddb5,292010f..6379c25
--- a/client/src/app.js
+++ b/client/src/app.js
@@@ -109,11 -109,11 +109,11 @@@ _kiwi.global = 
      },
  
      // Entry point to start the kiwi application
-     start: function (opts, callback) {
+     init: function (opts, callback) {
 -        var continueStart, locale;
 +        var continueStart, locale, igniteTextTheme, text_theme;
          opts = opts || {};
  
-         continueStart = function (locale, s, xhr) {
+         continueInit = function (locale, s, xhr) {
              if (locale) {
                  _kiwi.global.i18n = new Jed(locale);
              } else {
@@@ -146,18 -140,19 +146,26 @@@
  
          locale = _kiwi.global.settings.get('locale');
          if (!locale) {
-             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);
+             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueInit);
          } else {
-             $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);
+             $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueInit);
          }
 +
 +        text_theme = opts.text_theme;
 +        if (!text_theme) {
 +            $.getJSON(opts.base_path + '/assets/text_themes/default.json', igniteTextTheme);
 +        } else {
 +            $.getJSON(opts.base_path + '/assets/text_themes/' + text_theme + '.json', igniteTextTheme);
 +        }
+     },
+ 
+     start: function() {
+         _kiwi.app.showStartup();
+     },
  
+     // Allow plugins to change the startup applet
+     registerStartupApplet: function(startup_applet_name) {
 -        _kiwi.app.startup_applet_name = startup_applet_name;
++        _kiwi.app.startup_applet_name = startup_applet_name;
      }
  };