Skip to content
Snippets Groups Projects
Commit 22e78929 authored by PavelBegunkov's avatar PavelBegunkov
Browse files

Fix wnd.js error + dead code elimination/

parent 11afb4e9
Branches
Tags
No related merge requests found
...@@ -103,11 +103,4 @@ function onSettingsPopup() { ...@@ -103,11 +103,4 @@ function onSettingsPopup() {
}, 'json' }, 'json'
); );
}); });
// email section
$('.changeEmail').click(function () {
//if (/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,6})$/.test($('.inputNewEmail').val()))
// $.post(URLdir+'/handler/settings/changeEmail', {'email': $('.inputNewEmail').val()},
});
} }
$(function () { $(function () {
$('#openHelp').click(function () { $('#openHelp').click(function () {
$.postJSON(URLdir + 'window/help:student:index') $.postJSON(URLdir + 'window/help:student:index')
.done(data => wnd.open(data)) .done(data => wnd.open(data));
}); });
}); });
\ No newline at end of file
...@@ -11,7 +11,7 @@ wnd.show = function () { ...@@ -11,7 +11,7 @@ wnd.show = function () {
wnd.hide = function () { wnd.hide = function () {
wnd.isShow = false; wnd.isShow = false;
wnd.$.page.css({ position: 'static', 'margin-top', 0 }); wnd.$.page.css({ position: 'static', 'margin-top': 0 });
$(window).scrollTop(wnd.scroll); $(window).scrollTop(wnd.scroll);
wnd.$.window.fadeOut("fast"); wnd.$.window.fadeOut("fast");
}; };
......
...@@ -5,10 +5,7 @@ class Controller_Window extends Controller ...@@ -5,10 +5,7 @@ class Controller_Window extends Controller
private $user; private $user;
public function before() { public function before() {
$user = User::instance(); $this->user = User::instance();
//if ($user->isSignedIn()) {
// $this->user = $user->toArray();
//}
} }
public function action_get() { public function action_get() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment