From 05d4682d5e19a51dcd5292039aa8be0aa090fb3d Mon Sep 17 00:00:00 2001 From: Ben Davis Date: Mon, 10 Aug 2015 11:07:37 -0400 Subject: [PATCH 1/4] Adding check before doing custom column render. Making sure the column is not either checkbox or actions column. --- js/repeater-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/repeater-list.js b/js/repeater-list.js index 1df5db21a..f0f85288a 100755 --- a/js/repeater-list.js +++ b/js/repeater-list.js @@ -538,7 +538,7 @@ $col.html(checkBoxMarkup); } - if (this.viewOptions.list_columnRendered) { + if (this.viewOptions.list_columnRendered && !(columns[columnIndex].property === '@_CHECKBOX_@' || columns[columnIndex].property === '@_ACTIONS_@')) { this.viewOptions.list_columnRendered({ container: $row, columnAttr: columns[columnIndex].property, From 966ee5973efd96b8083bcf6095d1bb18562d71ac Mon Sep 17 00:00:00 2001 From: Ben Davis Date: Tue, 11 Aug 2015 10:51:12 -0400 Subject: [PATCH 2/4] Adding check before doing custom column render. Making sure the column is not either checkbox or actions column. --- js/repeater-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/repeater-list.js b/js/repeater-list.js index f0f85288a..23aa820d2 100755 --- a/js/repeater-list.js +++ b/js/repeater-list.js @@ -538,7 +538,7 @@ $col.html(checkBoxMarkup); } - if (this.viewOptions.list_columnRendered && !(columns[columnIndex].property === '@_CHECKBOX_@' || columns[columnIndex].property === '@_ACTIONS_@')) { + if (!(columns[columnIndex].property === '@_CHECKBOX_@' || columns[columnIndex].property === '@_ACTIONS_@') && this.viewOptions.list_columnRendered) { this.viewOptions.list_columnRendered({ container: $row, columnAttr: columns[columnIndex].property, From 873af41fadf90afbfe82091b0aef3e575c945d62 Mon Sep 17 00:00:00 2001 From: Stephen James Date: Tue, 11 Aug 2015 16:07:37 -0400 Subject: [PATCH 3/4] Make package version dynamic Previous version set at "compile time" and updated once --- Gruntfile.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 966ce746d..074b1ba4f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,11 +3,14 @@ module.exports = function (grunt) { 'use strict'; + function getPackageVersion() { + return grunt.file.readJSON('./package.json').version; + } + // use --no-livereload to disable livereload. Helpful to 'serve' multiple projects var isLivereloadEnabled = (typeof grunt.option('livereload') !== 'undefined') ? grunt.option('livereload') : true; var semver = require('semver'); - var packageVersion = require('./package.json').version; var fs = require('fs'); var path = require('path'); @@ -382,15 +385,15 @@ module.exports = function (grunt) { choices: [ { value: 'patch', - name: 'Patch: ' + semver.inc(packageVersion, 'patch') + ' Backwards-compatible bug fixes.' + name: 'Patch: ' + semver.inc(getPackageVersion(), 'patch') + ' Backwards-compatible bug fixes.' }, { value: 'minor', - name: 'Minor: ' + semver.inc(packageVersion, 'minor') + ' Add functionality in a backwards-compatible manner.' + name: 'Minor: ' + semver.inc(getPackageVersion(), 'minor') + ' Add functionality in a backwards-compatible manner.' }, { value: 'major', - name: 'Major: ' + semver.inc(packageVersion, 'major') + ' Incompatible API changes.' + name: 'Major: ' + semver.inc(getPackageVersion(), 'major') + ' Incompatible API changes.' }, { value: 'custom', @@ -626,7 +629,7 @@ module.exports = function (grunt) { }, tag: { command: function() { - var command = 'git tag -a "' + grunt.config('pkg.version') + '" -m "' + grunt.config('pkg.version') + '"'; + var command = 'git tag -a "' + getPackageVersion() + '" -m "' + getPackageVersion() + '"'; grunt.log.write('Tagging: ' + command); return command; } @@ -641,7 +644,7 @@ module.exports = function (grunt) { }, pushTagToUpstream: { command: function() { - var command = 'git push ' + grunt.config('release.remoteRepository') + ' ' + packageVersion; + var command = 'git push ' + grunt.config('release.remoteRepository') + ' ' + getPackageVersion(); grunt.log.write('Publishing tag: ' + command); return command; } @@ -665,9 +668,9 @@ module.exports = function (grunt) { 'echo "Done uploading files."'].join(' && '); } var command = [ - packageVersion, - semver.major(packageVersion) + '.' + semver.minor(packageVersion), - semver.major(packageVersion) + getPackageVersion(), + semver.major(getPackageVersion()) + '.' + semver.minor(getPackageVersion()), + semver.major(getPackageVersion()) ].map(createUploadCommand).join(' && '); grunt.log.write('Uploading: ' + command); grunt.log.writeln(''); @@ -838,10 +841,6 @@ module.exports = function (grunt) { ------------- */ grunt.registerTask('notes', 'Run a ruby gem that will request from Github unreleased pull requests', ['shell:notes']); - grunt.registerTask('updateRelease', '', function () { - packageVersion = require('./package.json').version; - }); - // Maintainers: Run prior to a release. Includes SauceLabs VM tests. grunt.registerTask('release', 'Release a new version, push it and publish it', function() { if ( typeof grunt.config('sauceLoginFile') === 'undefined' ) { @@ -856,7 +855,7 @@ module.exports = function (grunt) { // update local variable to make sure build prompt is using temp branch's package version grunt.task.run(['prompt:tempbranch', 'shell:checkoutRemoteReleaseBranch', - 'updateRelease', 'prompt:build', 'dorelease']); + 'prompt:build', 'dorelease']); }); // formerally dorelease task From 34362708c894340df25e88f4d1b24a407ef8fb45 Mon Sep 17 00:00:00 2001 From: dwaltz Date: Thu, 13 Aug 2015 10:34:54 -0600 Subject: [PATCH 4/4] Hiding footer for infinite scrolling view --- js/repeater.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/js/repeater.js b/js/repeater.js index 288e9c7af..0e5dee843 100755 --- a/js/repeater.js +++ b/js/repeater.js @@ -325,8 +325,8 @@ }, infiniteScrolling: function (enable, options) { - var itemization = this.$element.find('.repeater-itemization'); - var pagination = this.$element.find('.repeater-pagination'); + var footer = this.$element.find('.repeater-footer'); + var viewport = this.$element.find('.repeater-viewport'); var cont, data; options = options || {}; @@ -337,8 +337,10 @@ delete options.dataSource; delete options.end; this.infiniteScrollingOptions = options; - itemization.hide(); - pagination.hide(); + viewport.css({ + height: viewport.height() + footer.outerHeight() + }); + footer.hide(); } else { cont = this.infiniteScrollingCont; data = cont.data(); @@ -350,8 +352,10 @@ this.infiniteScrollingEnabled = false; this.infiniteScrollingEnd = null; this.infiniteScrollingOptions = {}; - itemization.show(); - pagination.show(); + viewport.css({ + height: viewport.height() - footer.outerHeight() + }); + footer.show(); } },