From 4970e80145075a247886a50251ca9178cb172184 Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Wed, 13 Apr 2016 15:29:18 -0400 Subject: [PATCH 1/5] fix(getData): show handsontable when copy-paste option is choosen #SOCRFW-241 --- app/scripts/analysis/getData/getData.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/scripts/analysis/getData/getData.coffee b/app/scripts/analysis/getData/getData.coffee index fd71ede9..3229d9a4 100644 --- a/app/scripts/analysis/getData/getData.coffee +++ b/app/scripts/analysis/getData/getData.coffee @@ -353,7 +353,6 @@ getData = angular.module('app_analysis_getData', [ # TODO: getData module shouldn't know about controllers listening for handsontable update $scope.$emit 'update handsontable', data - # available SOCR Datasets $scope.socrDatasets = [ id: 'IRIS' @@ -444,6 +443,8 @@ getData = angular.module('app_analysis_getData', [ # adding listeners $scope.$on 'update showStates', (obj, data) -> _showState.set data + # TODO: fix this workaround for displaying copy-paste table + $scope.dataType = DATA_TYPES.FLAT if data is 'grid' $scope.$on '$viewContentLoaded', -> console.log 'get data main div loaded' From bc4a613738aaabe167db835fa3801b509663ae1c Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Fri, 22 Apr 2016 17:27:16 -0400 Subject: [PATCH 2/5] fix(db): save nested data into nested db #SOCRFW-258 --- app/scripts/db/db.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/db/db.coffee b/app/scripts/db/db.coffee index 7b05ef73..1c70848c 100644 --- a/app/scripts/db/db.coffee +++ b/app/scripts/db/db.coffee @@ -311,7 +311,7 @@ db.factory 'app_database_handler', [ res = _db.create dvData, obj.tableName res when DATA_TYPES.NESTED - nestedDb.save obj.data + nestedDb.save obj.dataFrame.data true else console.log '%cDATABASE: data type is unknown' , 'color:green' else console.log '%cDATABASE: data type is unknown' , 'color:green' From 61ef1238d5be9d14d4fbfacb729c1942446ad324 Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Fri, 22 Apr 2016 18:47:47 -0400 Subject: [PATCH 3/5] fix(getData): fix handsontable container element selection #SOCRFW-262 --- app/scripts/analysis/getData/getData.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/analysis/getData/getData.coffee b/app/scripts/analysis/getData/getData.coffee index 3229d9a4..b0be02e4 100644 --- a/app/scripts/analysis/getData/getData.coffee +++ b/app/scripts/analysis/getData/getData.coffee @@ -669,8 +669,8 @@ getData = angular.module('app_analysis_getData', [ DATA_TYPES = eventManager.getSupportedDataTypes() - currHeight = elem.height() - currWidth = elem.width() + currHeight = elem[0].offsetHeight + currWidth = elem[0].offsetWidth #check if data is in the right format # if arg? and typeof arg.data is 'object' and typeof arg.columns is 'object' @@ -721,7 +721,7 @@ getData = angular.module('app_analysis_getData', [ try # hook for pushing data changes to handsontable # TODO: get rid of tight coupling :-/ - ht = elem.handsontable obj + ht = $(elem).handsontable obj window['inputCache'] = inputCache.ht = $(ht[0]).data('handsontable') catch e $exceptionHandler e From 3d483e89d2fb1fb76bc9aff7a4898d2ff49dfe2e Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Fri, 22 Apr 2016 18:48:40 -0400 Subject: [PATCH 4/5] chore: update dependencies #SOCRFW-262 --- app/index.jade | 4 ++-- bower.json | 4 ++-- package.json | 6 +++--- test/karma.conf.coffee | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/index.jade b/app/index.jade index a85450ce..8835fbf5 100644 --- a/app/index.jade +++ b/app/index.jade @@ -18,9 +18,8 @@ html(lang='en', ng-app='app') link(rel='stylesheet', href='bower_components/bootstrap/dist/css/bootstrap.css') // endbower // bower:js - script(src='bower_components/jquery/dist/jquery.js') script(src='bower_components/angular/angular.js') - script(src='bower_components/jquery-layout/source/stable/jquery.layout.js') + script(src='bower_components/jquery/dist/jquery.js') script(src='bower_components/jquery-highlight/jquery.highlight.js') script(src='bower_components/jquery-hoverintent/jquery.hoverIntent.js') script(src='bower_components/datatables/media/js/jquery.dataTables.js') @@ -42,6 +41,7 @@ html(lang='en', ng-app='app') script(src='bower_components/wrangler/dw.js') script(src='bower_components/bootstrap/dist/js/bootstrap.js') script(src='bower_components/angular-bootstrap/ui-bootstrap-tpls.js') + script(src='bower_components/jquery-layout/source/stable/jquery.layout.js') script(src='bower_components/jstat/dist/jstat.js') script(src='bower_components/jsfeat/build/jsfeat.js') // endbower diff --git a/bower.json b/bower.json index 17257b9b..bc0ffc27 100644 --- a/bower.json +++ b/bower.json @@ -6,7 +6,6 @@ "homepage": "https://github.com/SOCR/SOCRAT", "dependencies": { "angular": "^1.5.0", - "jquery-layout": "~1.4.3", "jquery-highlight": "~3.3.0", "jquery-hoverintent": "https://github.com/briancherne/jquery-hoverIntent.git#~1.8.1", "datatables": "DataTables#~1.10.11", @@ -20,10 +19,11 @@ "angular-touch": "^1.5.0", "angular-ui": "^0.4.0", "angular-ui-router": "~0.2.18", - "ngHandsontable": "angular-ui-handsontable#~0.9.0", + "ngHandsontable": "angular-ui-handsontable#~0.10.0", "wrangler": "https://github.com/alxndrkalinin/wrangler.git", "bootstrap": "^3.3.6", "angular-bootstrap": "^1.1.0", + "jquery-layout": "~1.4.3", "jstat": "~1.5.2", "jsfeat": "~0.0.8" }, diff --git a/package.json b/package.json index e5c594ee..724ec6ad 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "grunt-ng-annotate": "^2.0.1", "grunt-svgmin": "^3.0.0", "grunt-usemin": "^3.0.0", - "grunt-wiredep": "^2.0.0", + "grunt-wiredep": "^3.0.0", "serve-static": "^1.10.2", "jade": "^1.11.0", "jasmine-core": "^2.4.1", @@ -44,9 +44,9 @@ "karma": "^0.13.0", "karma-coffee-preprocessor": "*", "karma-jasmine": "*", - "karma-phantomjs2-launcher": "~0.4.0", + "karma-phantomjs2-launcher": "~0.5.0", "less": "^2.5.3", - "phantomjs2": "~2.0.2", + "phantomjs2": "~2.2.0", "time-grunt": "^1.0.0" }, "engines": { diff --git a/test/karma.conf.coffee b/test/karma.conf.coffee index a8841fc2..be261623 100644 --- a/test/karma.conf.coffee +++ b/test/karma.conf.coffee @@ -17,9 +17,8 @@ module.exports = (config) -> # list of files / patterns to load in the browser files: [ # bower:js - 'bower_components/jquery/dist/jquery.js' 'bower_components/angular/angular.js' - 'bower_components/jquery-layout/source/stable/jquery.layout.js' + 'bower_components/jquery/dist/jquery.js' 'bower_components/jquery-highlight/jquery.highlight.js' 'bower_components/jquery-hoverintent/jquery.hoverIntent.js' 'bower_components/datatables/media/js/jquery.dataTables.js' @@ -41,6 +40,7 @@ module.exports = (config) -> 'bower_components/wrangler/dw.js' 'bower_components/bootstrap/dist/js/bootstrap.js' 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js' + 'bower_components/jquery-layout/source/stable/jquery.layout.js' 'bower_components/jstat/dist/jstat.js' 'bower_components/jsfeat/build/jsfeat.js' 'bower_components/angular-mocks/angular-mocks.js' From bb8fc47bb4908c6dd08079469634b4b8cecf0019 Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Fri, 22 Apr 2016 18:50:28 -0400 Subject: [PATCH 5/5] chore: version bump to 0.1.5-alpha.7 # #SOCRFW-261 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index bc0ffc27..ff91c363 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "author": "Alexandr Kalinin, Selvam Palanimalai", "name": "SOCRAT", - "version": "v0.1.5-alpha.6", + "version": "v0.1.5-alpha.7", "description": "Flexible HTML5/JS toolkit for interactive data analysis and visuzalization", "homepage": "https://github.com/SOCR/SOCRAT", "dependencies": { diff --git a/package.json b/package.json index 724ec6ad..76d075d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "Alexandr Kalinin, Selvam Palanimalai", "name": "SOCRAT", - "version": "v0.1.5-alpha.6", + "version": "v0.1.5-alpha.7", "description": "Flexible HTML5/JS toolkit for interactive data analysis and visuzalization", "homepage": "https://github.com/SOCR/SOCRAT", "repository": {