-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/2019.2.4' into stable-2019.2
- Loading branch information
Showing
28 changed files
with
1,104 additions
and
304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 52 additions & 23 deletions
75
Source/Plugins/Core/com.equella.core/resources/web/scripts/wizardctrl.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,53 @@ | ||
| /* | ||
| * Licensed to The Apereo Foundation under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * The Apereo Foundation licenses this file to you under the Apache License, | ||
| * Version 2.0, (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| var WizardCtrl = { | ||
| setMessage : function(ctrlid, message) | ||
| { | ||
| var $ctrl = $("#" + ctrlid); | ||
| var $content = $ctrl.children("div:first-child"); | ||
| var $msg = $content.children("p.ctrlinvalidmessage"); | ||
| if (!message) | ||
| { | ||
| $content.removeClass("ctrlinvalid"); | ||
| $msg.empty(); | ||
| } | ||
| else | ||
| { | ||
| $content.addClass("ctrlinvalid"); | ||
| $msg.html(message); | ||
| } | ||
| }, | ||
| affixDiv: function() { | ||
| var ad = $("#affix-div"); | ||
| ad.attr("data-spy", "affix"); | ||
| var offset = (ad.offset().top) - 55; | ||
| ad.attr("data-offset-top",offset); | ||
| } | ||
| }; | ||
| setMessage: function (ctrlid, message) { | ||
| var $ctrl = $("#" + ctrlid); | ||
| var $content = $ctrl.children("div:first-child"); | ||
| var $msg = $content.children("p.ctrlinvalidmessage"); | ||
| if (!message) { | ||
| $content.removeClass("ctrlinvalid"); | ||
| $msg.empty(); | ||
| } else { | ||
| $content.addClass("ctrlinvalid"); | ||
| $msg.html(message); | ||
| } | ||
| }, | ||
| affixDiv: function () { | ||
| var ad = $("#affix-div"); | ||
| ad.attr("data-spy", "affix"); | ||
| var offset = ad.offset().top - 55; | ||
| ad.attr("data-offset-top", offset); | ||
| }, | ||
| affixDivNewUI: function () { | ||
| const moderationPanel = $("#moderate"); | ||
| const affixDiv = $("#affix-div"); | ||
| if (moderationPanel.length > 0) { | ||
| $(window).on("scroll", function () { | ||
| // Use outerHeight to include margin. | ||
| const moderationPanelHeight = moderationPanel.outerHeight(true); | ||
| const currentWindowYPos = $(window).scrollTop(); | ||
| currentWindowYPos >= moderationPanelHeight | ||
| ? affixDiv.addClass("moderation-rightNav") | ||
| : affixDiv.removeClass("moderation-rightNav"); | ||
| }); | ||
| } else { | ||
| affixDiv.addClass("contribution-rightNav"); | ||
| } | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.