Skip to content

Commit

Permalink
Merge branch 'feature/pathoption' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
chambaz committed Jun 11, 2013
2 parents 84d9867 + 81ae987 commit d3bea64
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,7 @@ <h2>A <span>responsive <span>960</span> grid</span>
<script src="js/libs/ui/gumby.radiobtn.js"></script>
<script src="js/libs/ui/gumby.tabs.js"></script>
<script src="js/libs/ui/gumby.navbar.js"></script>
<script src="js/libs/ui/gumby.fittext.js"></script>
<script src="js/libs/ui/jquery.validation.js"></script>
<script src="js/libs/gumby.init.js"></script>-->

Expand Down
2 changes: 1 addition & 1 deletion js/libs/gumby.init.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Modernizr.load({
test: Modernizr.touch,

// if present load custom jQuery mobile build and update Gumby.click
yep: 'js/libs/jquery.mobile.custom.min.js',
yep: Gumby.path+'/jquery.mobile.custom.min.js',
callback: function(url, result, key) {
// check jQuery mobile has successfully loaded before using tap events
if($.mobile) {
Expand Down
7 changes: 6 additions & 1 deletion js/libs/gumby.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
this.onReady = this.onOldie = this.onTouch = false;
this.uiModules = {};
this.inits = {};

// check and set path with js/libs default
this.path = $('script[gumby-path]').attr('gumby-path') ||
$('script[data-path]').attr('data-path') ||
$('script[path]').attr('path') ||
'js/libs';
}

// initialize Gumby
Expand Down Expand Up @@ -84,7 +90,6 @@
};
};


// grab attribute value, testing data- gumby- and no prefix
Gumby.prototype.selectAttr = function() {
var i = 0;
Expand Down
2 changes: 1 addition & 1 deletion js/libs/gumby.min.js

Large diffs are not rendered by default.

0 comments on commit d3bea64

Please sign in to comment.