diff --git a/chromebook-checkout-meteor/client/admin.js b/chromebook-checkout-meteor/client/admin.js index 38bd669..b186f4f 100644 --- a/chromebook-checkout-meteor/client/admin.js +++ b/chromebook-checkout-meteor/client/admin.js @@ -29,7 +29,7 @@ Template.admin.events({ if (!((chromebook_number === "") || (chromebook_serial === ""))) - Chromebooks.insert({ + Chromebooks.insert({ "status": 0, "userid": null, "last_checkout": null, @@ -119,6 +119,8 @@ Template.admin.rendered = function() { $(".border.tabs-content").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 30 + mouseWheelPixels: 40, + contentTouchScroll: 30 }); + } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js index 2753822..509d686 100644 --- a/chromebook-checkout-meteor/client/checkout.js +++ b/chromebook-checkout-meteor/client/checkout.js @@ -27,6 +27,7 @@ Template.checkout.rendered = function() { $(".chckChromebooks").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 30 + mouseWheelPixels: 40, + contentTouchScroll: 30 }); } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/slide-fade.js b/chromebook-checkout-meteor/client/slide-fade.js index f1665dd..d8e3743 100644 --- a/chromebook-checkout-meteor/client/slide-fade.js +++ b/chromebook-checkout-meteor/client/slide-fade.js @@ -25,14 +25,9 @@ Momentum.registerPlugin('slide-fade', function(options) { removeElement: function(node, done) { var $node = $(node); - $node.velocity('slideUp', { - easing: options.easing, - duration: options.duration, - complete: function() { - $node.remove(); - done(); - } - }); - } - } + $node + .velocity('fadeOut'); + +} +} }); \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/teacher.js b/chromebook-checkout-meteor/client/teacher.js index fc7c227..06582e6 100644 --- a/chromebook-checkout-meteor/client/teacher.js +++ b/chromebook-checkout-meteor/client/teacher.js @@ -27,6 +27,7 @@ Template.teacher.rendered = function() { $(".tchChromebooks").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 30 + mouseWheelPixels: 40, + contentTouchScroll: 30 }); } diff --git a/chromebook-checkout-meteor/server/users.js b/chromebook-checkout-meteor/server/users.js index cc8f3de..c7eff2c 100644 --- a/chromebook-checkout-meteor/server/users.js +++ b/chromebook-checkout-meteor/server/users.js @@ -15,11 +15,11 @@ Meteor.publish('carts', function() { }); var adminusers = [ - "ybq987@gmail.com", "mminer@bloomfield.org", "qalieh.yaman90@bloomfield.org", "ksjdragon@gmail.com", - "chthomas@bloomfield.org" + "chthomas@bloomfield.org", + "ybq987@gmail.com" ]; for (var i = 0; i < adminusers.length; i++) { var adminuser = adminusers[i];