diff --git a/OurUmbraco.Client/package-lock.json b/OurUmbraco.Client/package-lock.json index 702bc000b0..51c50ee28f 100644 --- a/OurUmbraco.Client/package-lock.json +++ b/OurUmbraco.Client/package-lock.json @@ -7,7 +7,7 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=", "dev": true }, "amdefine": { @@ -55,7 +55,7 @@ "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", "dev": true }, "are-we-there-yet": { @@ -36080,7 +36080,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { "hosted-git-info": "2.5.0", @@ -36092,7 +36092,7 @@ "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { "are-we-there-yet": "1.1.4", @@ -36371,7 +36371,7 @@ "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "dev": true, "requires": { "glob": "7.1.2" @@ -36700,7 +36700,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -36715,7 +36715,7 @@ "wide-align": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=", "dev": true, "requires": { "string-width": "1.0.2" diff --git a/OurUmbraco.Client/src/js/app.js b/OurUmbraco.Client/src/js/app.js index 905bfd40b1..7f19bc306d 100644 --- a/OurUmbraco.Client/src/js/app.js +++ b/OurUmbraco.Client/src/js/app.js @@ -7,96 +7,96 @@ _.templateSettings = { jQuery(document).ready(function (){ - // Quick menu - var bodyVar = $('body'), - searchAll = $('.search-all'); - - $( ".user, .close" ).click(function(e) { - e.preventDefault(); - e.stopPropagation(); - bodyVar.toggleClass( "quickmenu" ); - }); - - $('.wrapper').on('click', function () { - bodyVar.removeClass('quickmenu'); - }); - - - // Mobile navigation - $("#toggle").click(function(e) { - e.preventDefault(); - $(".cross").toggleClass("open"); - $("nav").toggleClass("open"); - $("body").toggleClass("navopen"); - }); - - $('.pm-nuget').on('click', '.nuget', function(){ - $(this).focus(); - $(this).select(); - }); - - // Tab - $('.tabs li').click(function(){ - var tab_id = $(this).attr('data-tab'); - - $('.tabs li').removeClass('current'); - $('.tab-content').removeClass('current'); - - $(this).addClass('current'); - $("#"+tab_id).addClass('current'); - }); - - // Click effect - var ink, d, x, y; - $(".button, .inked").click(function(e){ - - if($(this).find(".ink").length === 0){ - $(this).prepend("
"); - } - - ink = $(this).find(".ink"); - ink.removeClass("animate"); - - if(!ink.height() && !ink.width()){ - d = Math.max($(this).outerWidth(), $(this).outerHeight()); - ink.css({height: d, width: d}); - } - - x = e.pageX - $(this).offset().left - ink.width()/2; - y = e.pageY - $(this).offset().top - ink.height()/2; - - ink.css({top: y+'px', left: x+'px'}).addClass("animate"); - }); + // Quick menu + var bodyVar = $('body'), + searchAll = $('.search-all'); + + $( ".user, .close" ).click(function(e) { + e.preventDefault(); + e.stopPropagation(); + bodyVar.toggleClass( "quickmenu" ); }); - var classOnScrollObject = function (selector, className, scrollDistance) { - this.item = $(selector); - this.itemClass = className; - this.scrollDistance = scrollDistance; - this.classApplied = false; - this.scrollContainer = $(window); - this.fromTop = this.scrollContainer.scrollTop(); - }; - - classOnScrollObject.prototype.applyClass = function() { - this.fromTop = this.scrollContainer.scrollTop(); + $('.wrapper').on('click', function () { + bodyVar.removeClass('quickmenu'); + }); + + + // Mobile navigation + $("#toggle").click(function(e) { + e.preventDefault(); + $(".cross").toggleClass("open"); + $("nav").toggleClass("open"); + $("body").toggleClass("navopen"); + }); + + $('.pm-nuget').on('click', '.nuget', function(){ + $(this).focus(); + $(this).select(); + }); + + // Tab + $('.tabs li').click(function(){ + var tab_id = $(this).attr('data-tab'); + + $('.tabs li').removeClass('current'); + $('.tab-content').removeClass('current'); + + $(this).addClass('current'); + $("#"+tab_id).addClass('current'); + }); + + // Click effect + var ink, d, x, y; + $(".button, .inked").click(function(e){ + + if($(this).find(".ink").length === 0){ + $(this).prepend(""); + } + + ink = $(this).find(".ink"); + ink.removeClass("animate"); + + if(!ink.height() && !ink.width()){ + d = Math.max($(this).outerWidth(), $(this).outerHeight()); + ink.css({height: d, width: d}); + } + + x = e.pageX - $(this).offset().left - ink.width()/2; + y = e.pageY - $(this).offset().top - ink.height()/2; - if (this.fromTop > this.scrollDistance && this.classApplied === false) { - this.classApplied = true; - this.item.addClass(this.itemClass); - } else if (this.fromTop < this.scrollDistance && this.classApplied === true) { - this.classApplied = false; - this.item.removeClass(this.itemClass); - } - }; + ink.css({top: y+'px', left: x+'px'}).addClass("animate"); + }); +}); + +var classOnScrollObject = function (selector, className, scrollDistance) { + this.item = $(selector); + this.itemClass = className; + this.scrollDistance = scrollDistance; + this.classApplied = false; + this.scrollContainer = $(window); + this.fromTop = this.scrollContainer.scrollTop(); +}; + +classOnScrollObject.prototype.applyClass = function() { + this.fromTop = this.scrollContainer.scrollTop(); + + if (this.fromTop > this.scrollDistance && this.classApplied === false) { + this.classApplied = true; + this.item.addClass(this.itemClass); + } else if (this.fromTop < this.scrollDistance && this.classApplied === true) { + this.classApplied = false; + this.item.removeClass(this.itemClass); + } +}; - function classOnScroll (selector, className, scrollDistance) { - var newClassOnScroll = new classOnScrollObject(selector, className, scrollDistance); +function classOnScroll (selector, className, scrollDistance) { + var newClassOnScroll = new classOnScrollObject(selector, className, scrollDistance); - newClassOnScroll.applyClass(); + newClassOnScroll.applyClass(); - newClassOnScroll.scrollContainer.scroll(function () { - newClassOnScroll.applyClass(); - }); + newClassOnScroll.scrollContainer.scroll(function () { + newClassOnScroll.applyClass(); + }); - } \ No newline at end of file +} \ No newline at end of file diff --git a/OurUmbraco.Client/src/js/vendor/whatInput.js b/OurUmbraco.Client/src/js/vendor/whatInput.js new file mode 100644 index 0000000000..a878b72774 --- /dev/null +++ b/OurUmbraco.Client/src/js/vendor/whatInput.js @@ -0,0 +1,7 @@ +/** + * what-input - A global utility for tracking the current input method (mouse, keyboard or touch). + * @version v5.1.0 + * @link https://github.com/ten1seven/what-input + * @license MIT + */ +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("whatInput",[],t):"object"==typeof exports?exports.whatInput=t():e.whatInput=t()}(this,function(){return function(e){function t(o){if(n[o])return n[o].exports;var i=n[o]={exports:{},id:o,loaded:!1};return e[o].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t){"use strict";e.exports=function(){if("undefined"==typeof document||"undefined"==typeof window)return{ask:function(){return"initial"},element:function(){return null},ignoreKeys:function(){},registerOnChange:function(){},unRegisterOnChange:function(){}};var e=document.documentElement,t=null,n="initial",o=n;window.sessionStorage&&(window.sessionStorage.getItem("what-input")&&(n=window.sessionStorage.getItem("what-input")),window.sessionStorage.getItem("what-intent")&&(o=window.sessionStorage.getItem("what-intent")));var i=null,r=["input","select","textarea"],s=[],u=[16,17,18,91,93],a={keydown:"keyboard",keyup:"keyboard",mousedown:"mouse",mousemove:"mouse",MSPointerDown:"pointer",MSPointerMove:"pointer",pointerdown:"pointer",pointermove:"pointer",touchstart:"touch"},d=!1,w=!1,c={x:null,y:null},p={2:"touch",3:"touch",4:"mouse"},f=!1;try{var l=Object.defineProperty({},"passive",{get:function(){f=!0}});window.addEventListener("test",null,l)}catch(e){}var m=function(){var e=!!f&&{passive:!0};window.PointerEvent?(window.addEventListener("pointerdown",v),window.addEventListener("pointermove",g)):window.MSPointerEvent?(window.addEventListener("MSPointerDown",v),window.addEventListener("MSPointerMove",g)):(window.addEventListener("mousedown",v),window.addEventListener("mousemove",g),"ontouchstart"in window&&(window.addEventListener("touchstart",L,e),window.addEventListener("touchend",v))),window.addEventListener(x(),g,e),window.addEventListener("keydown",L),window.addEventListener("keyup",L),window.addEventListener("focusin",y),window.addEventListener("focusout",E)},v=function(e){if(!d){var t=e.which,i=a[e.type];"pointer"===i&&(i=S(e));var s="keyboard"===i&&t&&-1===u.indexOf(t)||"mouse"===i||"touch"===i;if(n!==i&&s&&(n=i,window.sessionStorage&&window.sessionStorage.setItem("what-input",n),h("input")),o!==i&&s){var w=document.activeElement;w&&w.nodeName&&-1===r.indexOf(w.nodeName.toLowerCase())&&(o=i,window.sessionStorage&&window.sessionStorage.setItem("what-intent",o),h("intent"))}}},h=function(t){e.setAttribute("data-what"+t,"input"===t?n:o),b(t)},g=function(e){if(k(e),!d&&!w){var t=a[e.type];"pointer"===t&&(t=S(e)),o!==t&&(o=t,window.sessionStorage&&window.sessionStorage.setItem("what-intent",o),h("intent"))}},y=function(n){if(!n.target.nodeName)return void E();t=n.target.nodeName.toLowerCase(),e.setAttribute("data-whatelement",t),n.target.classList&&n.target.classList.length&&e.setAttribute("data-whatclasses",n.target.classList.toString().replace(" ",","))},E=function(){t=null,e.removeAttribute("data-whatelement"),e.removeAttribute("data-whatclasses")},L=function(e){v(e),window.clearTimeout(i),d=!0,i=window.setTimeout(function(){d=!1},100)},S=function(e){return"number"==typeof e.pointerType?p[e.pointerType]:"pen"===e.pointerType?"touch":e.pointerType},x=function(){return"onwheel"in document.createElement("div")?"wheel":void 0!==document.onmousewheel?"mousewheel":"DOMMouseScroll"},b=function(e){for(var t=0,i=s.length;t setTimeout(resolve, 100)); + }, + + bindOnMentionChange: function () { + jQuery('#high-five-mention').keyup(function(e) { + HighFives.selectedMember = false; + HighFives.getMember(e.target.value); + HighFives.selectMemberIfMatches(e.target.value); + }); + }, + bindOnLinkChange: function () { + jQuery('#high-five-url').keyup(_.debounce(HighFives.getUrlTitle, 300)); + }, + bindOnMemberSelect: function() { + jQuery('#high-five-form .suggestions-list button').unbind('click'); + jQuery('#high-five-form .suggestions-list button').click(function(e) { + var id = e.target.getAttribute('data-id'); + HighFives.selectedMember = { + id: e.target.getAttribute('data-id'), + name: e.target.innerHTML + }; + HighFives.selectMember(HighFives.selectedMember); + }); + // unbind from previous versions just in case + }, + + bindOnCategorySelect: function () { + var categorySeleted = jQuery('#high-five-task option:selected').text(); + HighFives.preview.Category = categorySeleted; + HighFives.updatePreviewNode(); + }, + + bindOnSubmitForm: function() { + jQuery('#high-five-form').submit(function(e) { + e.preventDefault(); + if (HighFives.isFormValid()) { + HighFives.submitHighFive(HighFives.selectedMember.id, jQuery('#high-five-task').val(), jQuery('#high-five-url').val(), HighFives.linkTitle, function () { + HighFives.resetForm(); + HighFives.removePreviewNode(); + HighFives.getRecentHighFiveActivity(0, function(response) { + var activity = typeof response == 'string' ? JSON.parse(response): response; + HighFives.updateHighFiveList(activity.HighFives); + HighFives.buildactivityListNode(HighFives.list); + }); + }); + } + }); + }, + + // buildactivityListNode - Builds a list of list items that represent the activity list and adds them to an activity list for users to view. + buildactivityListNode: function () { + var highFives = HighFives.list; + + if (highFives && highFives.length > 0) { + HighFives.activityListNode.innerHTML = ''; + for (var i = 0; i < highFives.length; i++) { + var highFive = highFives[i]; + HighFives.activityListNode.innerHTML += HighFives.createHighFivePanelHtml(highFive); + } + + } + }, + createPreviewNode() { + var preview = document.createElement("ul"); + preview.classList.add("high-five__activity-list"); + preview.classList.add("high-five__activity-list--preview"); + return preview; + }, + updatePreviewNode: function() { + HighFives.previewNode.innerHTML = ''; + var highFive = HighFives.preview; + HighFives.previewNode.innerHTML += 'Preview of your High Five:
'; + HighFives.previewNode.innerHTML += HighFives.createHighFivePanelHtml(highFive); + + if(document.body.contains(HighFives.previewNode) === false) { + HighFives.highFiveActivityNode.prepend(HighFives.previewNode); + } + }, + removePreviewNode: function () { + HighFives.previewNode.remove(); + HighFives.defaultPreview(); + }, + createHighFivePanelHtml(highFive) { + return '@member.GetPropertyValue("profileText")
-@member.GetPropertyValue("profileText")
Reply by @mem.Name @topic.Updated.ConvertToRelativeTime()
-Reply by @mem.Name @topic.Updated.ConvertToRelativeTime()
@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
Updated: @project.UpdateDate.ToLongDateString()
-@Umbraco.StripHtml(Umbraco.Truncate(project.GetPropertyValue
Updated: @project.UpdateDate.ToLongDateString()
Moderator Tools (also known as "with great power comes great responsibility"):
Moderator Tools (also known as "with great power comes great responsibility"):
All threads this member was involved in (created or commented)
+HQ Tools (also known as "with great power comes great responsibility"):
All threads this member was involved in (created or commented)
-HQ Tools (also known as "with great power comes great responsibility"):