Skip to content

Commit

Permalink
theme maintenance
Browse files Browse the repository at this point in the history
update gulp to publish to new folder structure
update jquery
add gitignore for node/gulp
split up theme files with variable files
delete deprecated files
  • Loading branch information
arroyo committed Sep 11, 2016
1 parent 5b7fe37 commit ccc3a44
Show file tree
Hide file tree
Showing 29 changed files with 57 additions and 46,785 deletions.
2 changes: 2 additions & 0 deletions app/themes/bootstrap/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
stage
4 changes: 2 additions & 2 deletions app/themes/bootstrap/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ gulp.task('minify-css', function() {
suffix: '.min',
extname: '.css'
}))
.pipe(gulp.dest('../../../public/themes/bootstrap/css'));
.pipe(gulp.dest('../../../public/default/themes/bootstrap/css'));
});

// minify JS and put in the public dir
Expand All @@ -117,6 +117,6 @@ gulp.task('minify-js', function () {
]))
.pipe($.concat('scripts.min.js'))
.pipe($.uglify())
.pipe(gulp.dest('../../../public/themes/bootstrap/js'));
.pipe(gulp.dest('../../../public/default/themes/bootstrap/js'));

});
48 changes: 10 additions & 38 deletions app/themes/bootstrap/scripts/vendor/jquery.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* jQuery JavaScript Library v2.2.2
* jQuery JavaScript Library v2.2.4
* http://jquery.com/
*
* Includes Sizzle.js
Expand All @@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-03-17T17:51Z
* Date: 2016-05-20T17:23Z
*/

(function( global, factory ) {
Expand Down Expand Up @@ -65,7 +65,7 @@ var support = {};


var
version = "2.2.2",
version = "2.2.4",

// Define a local copy of jQuery
jQuery = function( selector, context ) {
Expand Down Expand Up @@ -5006,13 +5006,14 @@ jQuery.Event.prototype = {
isDefaultPrevented: returnFalse,
isPropagationStopped: returnFalse,
isImmediatePropagationStopped: returnFalse,
isSimulated: false,

preventDefault: function() {
var e = this.originalEvent;

this.isDefaultPrevented = returnTrue;

if ( e ) {
if ( e && !this.isSimulated ) {
e.preventDefault();
}
},
Expand All @@ -5021,7 +5022,7 @@ jQuery.Event.prototype = {

this.isPropagationStopped = returnTrue;

if ( e ) {
if ( e && !this.isSimulated ) {
e.stopPropagation();
}
},
Expand All @@ -5030,7 +5031,7 @@ jQuery.Event.prototype = {

this.isImmediatePropagationStopped = returnTrue;

if ( e ) {
if ( e && !this.isSimulated ) {
e.stopImmediatePropagation();
}

Expand Down Expand Up @@ -5961,19 +5962,6 @@ function getWidthOrHeight( elem, name, extra ) {
styles = getStyles( elem ),
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";

// Support: IE11 only
// In IE 11 fullscreen elements inside of an iframe have
// 100x too small dimensions (gh-1764).
if ( document.msFullscreenElement && window.top !== window ) {

// Support: IE11 only
// Running getBoundingClientRect on a disconnected node
// in IE throws an error.
if ( elem.getClientRects().length ) {
val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
}
}

// Some non-html elements return undefined for offsetWidth, so check for null/undefined
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
Expand Down Expand Up @@ -7864,34 +7852,18 @@ jQuery.extend( jQuery.event, {
},

// Piggyback on a donor event to simulate a different one
// Used only for `focus(in | out)` events
simulate: function( type, elem, event ) {
var e = jQuery.extend(
new jQuery.Event(),
event,
{
type: type,
isSimulated: true

// Previously, `originalEvent: {}` was set here, so stopPropagation call
// would not be triggered on donor event, since in our own
// jQuery.event.stopPropagation function we had a check for existence of
// originalEvent.stopPropagation method, so, consequently it would be a noop.
//
// But now, this "simulate" function is used only for events
// for which stopPropagation() is noop, so there is no need for that anymore.
//
// For the 1.x branch though, guard for "click" and "submit"
// events is still used, but was moved to jQuery.event.stopPropagation function
// because `originalEvent` should point to the original event for the constancy
// with other events and for more focused logic
}
);

jQuery.event.trigger( e, null, elem );

if ( e.isDefaultPrevented() ) {
event.preventDefault();
}
}

} );
Expand Down Expand Up @@ -9475,7 +9447,7 @@ jQuery.fn.load = function( url, params, callback ) {
// If it fails, this function gets "jqXHR", "status", "error"
} ).always( callback && function( jqXHR, status ) {
self.each( function() {
callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
} );
} );
}
Expand Down Expand Up @@ -9839,4 +9811,4 @@ if ( !noGlobal ) {
}

return jQuery;
}));
}));
Loading

0 comments on commit ccc3a44

Please sign in to comment.