diff --git a/media/js/settings.js b/media/js/settings.js index 8f16b483d5436a9e60c86d25aebbaafac797a392..431254870c8882ccfed3719b09a506c1cc764d0e 100644 --- a/media/js/settings.js +++ b/media/js/settings.js @@ -103,11 +103,4 @@ function onSettingsPopup() { }, '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()}, - }); } diff --git a/media/js/student/index.js b/media/js/student/index.js index b5c439f5c490248578f468887876725697cee101..c4c2487c476a0dce56a51fda75507e78273940da 100644 --- a/media/js/student/index.js +++ b/media/js/student/index.js @@ -1,6 +1,6 @@ $(function () { $('#openHelp').click(function () { $.postJSON(URLdir + 'window/help:student:index') - .done(data => wnd.open(data)) + .done(data => wnd.open(data)); }); -}); \ No newline at end of file +}); diff --git a/media/js/wnd/wnd.js b/media/js/wnd/wnd.js index a89f454f897a6bc75bd2ab2a06d4628a48ec8a63..2f9708a771188a0b03701c4f11da58dff1205f3f 100644 --- a/media/js/wnd/wnd.js +++ b/media/js/wnd/wnd.js @@ -11,7 +11,7 @@ wnd.show = function () { wnd.hide = function () { wnd.isShow = false; - wnd.$.page.css({ position: 'static', 'margin-top', 0 }); + wnd.$.page.css({ position: 'static', 'margin-top': 0 }); $(window).scrollTop(wnd.scroll); wnd.$.window.fadeOut("fast"); }; diff --git a/~dev_rating/application/classes/Controller/Window.php b/~dev_rating/application/classes/Controller/Window.php index 2605ccf1635fe2963f2654f5089f3243a3acfaa0..749311ecc40024f1c100effb3eb5b7172be2d742 100644 --- a/~dev_rating/application/classes/Controller/Window.php +++ b/~dev_rating/application/classes/Controller/Window.php @@ -5,10 +5,7 @@ class Controller_Window extends Controller private $user; public function before() { - $user = User::instance(); - //if ($user->isSignedIn()) { - // $this->user = $user->toArray(); - //} + $this->user = User::instance(); } public function action_get() {