diff options
author | Andrew Dolgov <[email protected]> | 2013-05-28 13:42:53 -0700 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-05-28 13:42:53 -0700 |
commit | f638b40348dfb9c98cacfd6259ea36cce26c0eef (patch) | |
tree | b756ebce8c2e3a9cf8f8a79e1107d827d1994bcd /include/login_form.php | |
parent | 4e46e90ef7cca9ab5b9f2ddcc260f1423265dbab (diff) | |
parent | 44bf49d4148a1e4068f01ae20e4a1e2af8c3ce70 (diff) |
Merge pull request #207 from gitawego/patch-4
@FIXED dijit modules aren't cached even all the js files are compressed
Diffstat (limited to 'include/login_form.php')
-rw-r--r-- | include/login_form.php | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/include/login_form.php b/include/login_form.php index 0637c453a..b401fdac0 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -6,12 +6,12 @@ <link rel="shortcut icon" type="image/png" href="images/favicon.png"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <script type="text/javascript" src="lib/dojo/dojo.js"></script> - <script type="text/javascript" src="lib/dijit/dijit.js"></script> <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script> <script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script> <script type="text/javascript"> + require({cache:{}}); Event.observe(window, 'load', function() { init(); }); @@ -104,20 +104,19 @@ <script type="text/javascript"> function init() { - dojo.require("dijit.form.Button"); - dojo.require("dijit.form.CheckBox"); - dojo.require("dijit.form.Form"); - dojo.require("dijit.form.Select"); - dojo.require("dijit.form.TextBox"); - dojo.require("dijit.form.ValidationTextBox"); - dojo.parser.parse(); + require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form', + 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){ + parser.parse(); + //show tooltip node only after this widget is instaniated. + dojo.query('div[dojoType="dijit.Tooltip"]').style({ + display:'' + }); + fetchProfiles(); + dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true'); + document.forms.loginForm.login.focus(); + }); - fetchProfiles(); - - dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true'); - - document.forms.loginForm.login.focus(); } function fetchProfiles() { @@ -217,7 +216,7 @@ function bwLimitChange(elem) { <label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label> </div> - <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below"> + <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none"> <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?> </div> |