Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: angular-ui/ui-grid
Choose a Base Repository
angular-ui/ui-grid
Aardvark71/ng-grid
AdelinGhanaem/ng-grid
AlasdairSwan/ng-grid
AntonFend/ng-grid
CNXTEoEorg/ui-grid
Dashue/ng-grid
Donderda/ng-grid
EricEngineered/ng-grid
EugeneBorshch/ng-grid
EugeneTruly/ng-grid
GenesysPureConnect/ng-grid
Jammasternam/ng-grid
JavaBasketball/ui-grid
Jenk-Rendar/ng-grid
JonahKE/ui-grid
KNaved/ui-grid
Klarence/ng-grid
Martin17/ng-grid
Mistobaan/ng-grid
Moreface/ng-grid
Pasha-Pramati/ng-grid
Premier/ng-grid
Reskov/ng-grid
SummerDejavu/ng-grid
UrvilKaswala/ng-grid
Wiinis/ng-grid
YonatanKra/ui-grid
a5sk4s/ng-grid
aaks2010/ng-grid
akhileshappala/ui-grid
alecswan/ng-grid
alexspurling/ng-grid
alpinegizmo/ng-grid
anuradha18/ng-grid
archsh/ng-grid
ata-n/ng-grid
avgalon/ng-grid
avikaco/ng-grid
ballmw/ng-grid
bbradbury/ng-grid
benjaminkitt/ng-grid
benmj/ng-grid
blackneus/ng-grid
bmleite/ng-grid
boland/ng-grid
bpoussin/ng-grid
bradlund/ng-grid
bundance/ng-grid
caphun/ng-grid
ccreed2/ui-grid
cdesogeti/ng-grid
ceolter/ui-grid
chanu587/ng-grid
chinnurtb/ng-grid
chiragchamoli/ng-grid
choroshin/ng-grid
christoffee/ng-grid
clkao/ng-grid
cxl55/ng-grid
daclubb/ng-grid
darkhorse-dev/ui-grid
darknos/ng-grid
dcolens/ng-grid
dean-me/ng-grid
demon-lord/ng-grid
devony/ng-grid
doctorsender/ng-grid
ebraminio/ng-grid
ezecafre89/ng-grid
felixhummel/ng-grid
firmusoft/ng-grid
francescoagati/ng-grid
frogomatic/ng-grid
garaboncias/ng-grid
getuliojr/ng-grid
giosakti/ng-grid
goldhand/ng-grid
goodluck2016/ui-grid
hawtio/ng-grid
hey24sheep/ui-grid
hoshidaniel/ng-grid
hotings/ng-grid
hucarrot/ng-grid
imloama/ng-grid
ineedfat/ng-grid
is-fredrik/ng-grid
ismakv/ui-grid
itxd/ui-grid
jeado/ng-grid
jeanpuga/ui-grid
jeffbcross/ng-grid
jeffslofish/ng-grid
jessegavin/ng-grid
jfzman/ng-grid
jharohit/ng-grid
jiacomino/ng-grid
jimhotchkin-wf/ng-grid
jimmytheneutrino/ng-grid
jmaynier/ng-grid
johlrich/ng-grid
johnobe/ng-grid
johnparn/ng-grid
jon23cooper/ng-grid
jozzhart/ng-grid
jspeshu/ng-grid
jstrachan/ng-grid
juliofreitas/ui-grid
jurby/ng-grid
karnyj/ng-grid
keathley/ng-grid
keithharvey/ng-grid
kmussel/ng-grid
koen-serry/ng-grid
konrad-garus/ng-grid
krahman/ng-grid
ksmoore/ng-grid
kugel-soft/ui-grid
lebedevsergey/ui-grid-fix-issue-with-pinned-columns-in-v2
leninloganathan/ui-grid
liergouzi/ui-grid
loiphamvn/ng-grid
longFeiLi/ui-grid
marciosartini/ng-grid
marklagendijk/ng-grid
martijnve/ng-grid
mathiasdose/ng-grid
mathieurivest/ng-grid
matpaprocki/ng-grid
mattlaver/ng-grid
maxcan/ng-grid
mchapman/ng-grid
mediaprojects/ng-grid
mgibson/ng-grid
mheye/ng-grid
mmatczak/ui-grid
mschroering/ng-grid
musically-ut/ng-grid
mxreppy/ng-grid
niilante/ui-grid
nishant8BITS/ng-grid
noming/ng-grid
nuclearghost/ng-grid
orneryd/ng-grid
owenXin/ng-grid
pdegenhardt/ng-grid
pdemanget/ng-grid
ppollono/ng-grid
prabhat2233/ui-grid
presidento/ng-grid
r7lemieux/ng-grid
richiepreece/ng-grid
ronbuchanan/ng-grid
sagarwasule/ng-grid
sapronlee/ng-grid
satyanand/ng-grid
sax1johno/ui-grid
seankenny/ng-grid
simonengelhardt/ng-grid
simplyjames/ng-grid
skusunam/ng-grid
snapappointments/ui-grid
sofibraun/ng-grid
solvebio/ng-grid
songguang-2010/ng-grid
sonicparke/ng-grid
sourcec0de/ng-grid
sravanthipoujula/ng-grid
sskyy/ng-grid
stan-z/ng-grid
strider820/ng-grid
sunfirefox/ng-grid
surfer26th/ng-grid
suryasingh/ng-grid
swalters/ng-grid
tcrimi/ng-grid
tetralon/ng-grid
thedarkjester/ng-grid
tjosbon/ng-grid
tkhemani/ng-grid
tradingscreen/ng-grid
tuckerjt07/ui-grid
turn/ng-grid
uapui-dev/ng-grid
vargose/ng-grid
vladovidiu/ng-grid
wdmny/ng-grid
wp-ng/ui-grid
xordad/ng-grid
xtidt/ui-grid
xtreme-christophe/ng-grid
yangsong158/ui-grid
yanl/ng-grid
yarl/ng-grid
yesnault/ng-grid
yunmanger1/ng-grid
zelingo/ui-grid
zhangdiwaa/ng-grid
zhanghaihua/ng-grid
ztp130213/ng-grid
Nothing to show
base: 43d64805d3a4^
head repository: angular-ui/ui-grid
Choose a Head Repository
angular-ui/ui-grid
Aardvark71/ng-grid
AdelinGhanaem/ng-grid
AlasdairSwan/ng-grid
AntonFend/ng-grid
CNXTEoEorg/ui-grid
Dashue/ng-grid
Donderda/ng-grid
EricEngineered/ng-grid
EugeneBorshch/ng-grid
EugeneTruly/ng-grid
GenesysPureConnect/ng-grid
Jammasternam/ng-grid
JavaBasketball/ui-grid
Jenk-Rendar/ng-grid
JonahKE/ui-grid
KNaved/ui-grid
Klarence/ng-grid
Martin17/ng-grid
Mistobaan/ng-grid
Moreface/ng-grid
Pasha-Pramati/ng-grid
Premier/ng-grid
Reskov/ng-grid
SummerDejavu/ng-grid
UrvilKaswala/ng-grid
Wiinis/ng-grid
YonatanKra/ui-grid
a5sk4s/ng-grid
aaks2010/ng-grid
akhileshappala/ui-grid
alecswan/ng-grid
alexspurling/ng-grid
alpinegizmo/ng-grid
anuradha18/ng-grid
archsh/ng-grid
ata-n/ng-grid
avgalon/ng-grid
avikaco/ng-grid
ballmw/ng-grid
bbradbury/ng-grid
benjaminkitt/ng-grid
benmj/ng-grid
blackneus/ng-grid
bmleite/ng-grid
boland/ng-grid
bpoussin/ng-grid
bradlund/ng-grid
bundance/ng-grid
caphun/ng-grid
ccreed2/ui-grid
cdesogeti/ng-grid
ceolter/ui-grid
chanu587/ng-grid
chinnurtb/ng-grid
chiragchamoli/ng-grid
choroshin/ng-grid
christoffee/ng-grid
clkao/ng-grid
cxl55/ng-grid
daclubb/ng-grid
darkhorse-dev/ui-grid
darknos/ng-grid
dcolens/ng-grid
dean-me/ng-grid
demon-lord/ng-grid
devony/ng-grid
doctorsender/ng-grid
ebraminio/ng-grid
ezecafre89/ng-grid
felixhummel/ng-grid
firmusoft/ng-grid
francescoagati/ng-grid
frogomatic/ng-grid
garaboncias/ng-grid
getuliojr/ng-grid
giosakti/ng-grid
goldhand/ng-grid
goodluck2016/ui-grid
hawtio/ng-grid
hey24sheep/ui-grid
hoshidaniel/ng-grid
hotings/ng-grid
hucarrot/ng-grid
imloama/ng-grid
ineedfat/ng-grid
is-fredrik/ng-grid
ismakv/ui-grid
itxd/ui-grid
jeado/ng-grid
jeanpuga/ui-grid
jeffbcross/ng-grid
jeffslofish/ng-grid
jessegavin/ng-grid
jfzman/ng-grid
jharohit/ng-grid
jiacomino/ng-grid
jimhotchkin-wf/ng-grid
jimmytheneutrino/ng-grid
jmaynier/ng-grid
johlrich/ng-grid
johnobe/ng-grid
johnparn/ng-grid
jon23cooper/ng-grid
jozzhart/ng-grid
jspeshu/ng-grid
jstrachan/ng-grid
juliofreitas/ui-grid
jurby/ng-grid
karnyj/ng-grid
keathley/ng-grid
keithharvey/ng-grid
kmussel/ng-grid
koen-serry/ng-grid
konrad-garus/ng-grid
krahman/ng-grid
ksmoore/ng-grid
kugel-soft/ui-grid
lebedevsergey/ui-grid-fix-issue-with-pinned-columns-in-v2
leninloganathan/ui-grid
liergouzi/ui-grid
loiphamvn/ng-grid
longFeiLi/ui-grid
marciosartini/ng-grid
marklagendijk/ng-grid
martijnve/ng-grid
mathiasdose/ng-grid
mathieurivest/ng-grid
matpaprocki/ng-grid
mattlaver/ng-grid
maxcan/ng-grid
mchapman/ng-grid
mediaprojects/ng-grid
mgibson/ng-grid
mheye/ng-grid
mmatczak/ui-grid
mschroering/ng-grid
musically-ut/ng-grid
mxreppy/ng-grid
niilante/ui-grid
nishant8BITS/ng-grid
noming/ng-grid
nuclearghost/ng-grid
orneryd/ng-grid
owenXin/ng-grid
pdegenhardt/ng-grid
pdemanget/ng-grid
ppollono/ng-grid
prabhat2233/ui-grid
presidento/ng-grid
r7lemieux/ng-grid
richiepreece/ng-grid
ronbuchanan/ng-grid
sagarwasule/ng-grid
sapronlee/ng-grid
satyanand/ng-grid
sax1johno/ui-grid
seankenny/ng-grid
simonengelhardt/ng-grid
simplyjames/ng-grid
skusunam/ng-grid
snapappointments/ui-grid
sofibraun/ng-grid
solvebio/ng-grid
songguang-2010/ng-grid
sonicparke/ng-grid
sourcec0de/ng-grid
sravanthipoujula/ng-grid
sskyy/ng-grid
stan-z/ng-grid
strider820/ng-grid
sunfirefox/ng-grid
surfer26th/ng-grid
suryasingh/ng-grid
swalters/ng-grid
tcrimi/ng-grid
tetralon/ng-grid
thedarkjester/ng-grid
tjosbon/ng-grid
tkhemani/ng-grid
tradingscreen/ng-grid
tuckerjt07/ui-grid
turn/ng-grid
uapui-dev/ng-grid
vargose/ng-grid
vladovidiu/ng-grid
wdmny/ng-grid
wp-ng/ui-grid
xordad/ng-grid
xtidt/ui-grid
xtreme-christophe/ng-grid
yangsong158/ui-grid
yanl/ng-grid
yarl/ng-grid
yesnault/ng-grid
yunmanger1/ng-grid
zelingo/ui-grid
zhangdiwaa/ng-grid
zhanghaihua/ng-grid
ztp130213/ng-grid
Nothing to show
compare: a227201cecd6
  • 7 commits
  • 55 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 10, 2014
A preventDefault() in the filter input's ng-click was preventing mobile
users from being able to select the input box. Tapping on it simply did
nothing.

Removing this preventDefault() fixed the issue, and does not seem to have
caused any side effects.
This should hopefully let users on touch-enabled devices do all actions a desktop
user can do
Binding to both for the same event causes issues for the grid menu as
touch-enabled browsers will fire touch events as well as mouse events
subsequently.

NOTE: PhantomJS provides touch events though you wouldn't expect it. I've
updated the header-cell test specs to allow choosing which sort of event
types to trigger.
jquery.simulate.js doesn't, by default, allow for touch events. A couple
simple changes add that
Showing with 197 additions and 98 deletions.
  1. +6 −2 lib/test/jquery.simulate.js
  2. +1 −1 misc/tutorial/101_intro.ngdoc
  3. +1 −1 misc/tutorial/102_sorting.ngdoc
  4. +1 −1 misc/tutorial/103_filtering.ngdoc
  5. +1 −1 misc/tutorial/104_i18n.ngdoc
  6. +1 −1 misc/tutorial/105_footer.ngdoc
  7. +1 −1 misc/tutorial/106_binding.ngdoc
  8. +1 −1 misc/tutorial/108_hidden_grids.ngdoc
  9. +1 −1 misc/tutorial/109_multiple_grids.ngdoc
  10. +1 −1 misc/tutorial/110_grid_in_modal.ngdoc
  11. +1 −1 misc/tutorial/111_cellClass.ngdoc
  12. +1 −1 misc/tutorial/112_swapping_data.ngdoc
  13. +1 −1 misc/tutorial/113_adding_and_removing_columns.ngdoc
  14. +1 −1 misc/tutorial/114_row_header.ngdoc
  15. +1 −1 misc/tutorial/115_headerCellClass.ngdoc
  16. +1 −1 misc/tutorial/120_RTL.ngdoc
  17. +1 −1 misc/tutorial/190_large_dataset.ngdoc
  18. +1 −1 misc/tutorial/191_horizontal_scrolling.ngdoc
  19. +1 −1 misc/tutorial/201_editable.ngdoc
  20. +1 −1 misc/tutorial/202_cellnav.ngdoc
  21. +1 −1 misc/tutorial/203_pinning.ngdoc
  22. +1 −1 misc/tutorial/204_column_resizing.ngdoc
  23. +1 −1 misc/tutorial/205_row_editable.ngdoc
  24. +1 −1 misc/tutorial/206_exporting_data.ngdoc
  25. +1 −1 misc/tutorial/207_importing_data.ngdoc
  26. +1 −1 misc/tutorial/210_selection.ngdoc
  27. +1 −1 misc/tutorial/211_two_grids.ngdoc
  28. +1 −1 misc/tutorial/212_infinite_scroll.ngdoc
  29. +1 −1 misc/tutorial/213_auto_resizing.ngdoc
  30. +1 −1 misc/tutorial/214_pagination.ngdoc
  31. +1 −1 misc/tutorial/215_paging.ngdoc
  32. +1 −1 misc/tutorial/301_custom_row_template.ngdoc
  33. +1 −1 misc/tutorial/301_editableOnFocus.ngdoc
  34. +1 −1 misc/tutorial/302_custom_header.ngdoc
  35. +1 −1 misc/tutorial/303_customizing_column_menu.ngdoc
  36. +1 −1 misc/tutorial/304_grid_menu.ngdoc
  37. +12 −5 misc/tutorial/305_externalScopes.ngdoc
  38. +1 −1 misc/tutorial/306_expandable_grid.ngdoc
  39. +1 −1 misc/tutorial/307_external_sorting.ngdoc
  40. +1 −1 misc/tutorial/308_external_filtering.ngdoc
  41. +1 −1 misc/tutorial/309_editable_with_cellnav.ngdoc
  42. +1 −1 misc/tutorial/310_column_moving.ngdoc
  43. +1 −1 misc/tutorial/311_importing_data_with_rowedit.ngdoc
  44. +1 −1 misc/tutorial/312_exporting_data_complex.ngdoc
  45. +1 −1 misc/tutorial/313_custom_interpolation_symbols.ngdoc
  46. +1 −1 misc/tutorial/314_external_paging.ngdoc
  47. +1 −1 misc/tutorial/401_AllFeatures.ngdoc
  48. +1 −1 misc/tutorial/402_GridIsScrolling.ngdoc
  49. +39 −4 src/features/edit/js/gridEdit.js
  50. +26 −13 src/features/resize-columns/js/ui-grid-column-resizer.js
  51. +22 −9 src/features/resize-columns/test/resizeColumns.spec.js
  52. +24 −12 src/js/core/directives/ui-grid-header-cell.js
  53. +1 −1 src/js/core/directives/ui-grid-render-container.js
  54. +1 −1 src/templates/ui-grid/uiGridHeaderCell.html
  55. +20 −5 test/unit/core/directives/ui-grid-header-cell.spec.js
@@ -12,7 +12,8 @@
;(function( $, undefined ) {

var rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|contextmenu)|click/;
rmouseEvent = /^(?:mouse|contextmenu)|click/,
rtouchEvent = /^touch/;

$.fn.simulate = function( type, options ) {
return this.each(function() {
@@ -82,13 +83,16 @@ $.extend( $.simulate.prototype, {
if ( rmouseEvent.test( type ) ) {
return this.mouseEvent( type, options );
}
else if ( rtouchEvent.test( type) ) {
return this.mouseEvent( type, options );
}
},

mouseEvent: function( type, options ) {
var event, eventDoc, doc, body;
options = $.extend({
bubbles: true,
cancelable: (type !== "mousemove"),
cancelable: (type !== "mousemove" && type !== "touchmove"),
view: window,
detail: 0,
screenX: 0,
@@ -66,7 +66,7 @@ Steps:
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', function ($scope) {

@@ -24,7 +24,7 @@ data has changed by calling `gridApi.core.notifyDataChange( grid, uiGridUtils.da

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
$scope.gridOptions1 = {
@@ -51,7 +51,7 @@ for `filters: [{ term: 'xxx' }]`. See the "age" column below for an example.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
$scope.gridOptions = {
@@ -19,7 +19,7 @@ Another option is to use the i18nService and use the setCurrentLang method
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', 'i18nService', '$http', function ($scope, i18nService, $http) {
$scope.langs = i18nService.getAllLangs();
@@ -14,7 +14,7 @@ show the aggregation but without a label. Refer the third column in the example
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope','uiGridConstants', '$http', function ($scope, uiGridConstants, $http) {
var data = [];
@@ -19,7 +19,7 @@ MODEL\_COL\_FIELD which will be replaced with row.entity.field. Use MODEL\_COL\
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.edit']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.edit']);

app.controller('MainCtrl', ['$scope', function ($scope) {

@@ -43,7 +43,7 @@ It's all up to you. And if you know a better way then please submit it in an iss
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.hideGrid = true;
@@ -7,7 +7,7 @@ Using multiple grids on a single page
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions1 = {};
@@ -7,7 +7,7 @@ Using a grid in a modal popup
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$rootScope', '$scope', '$http', 'modal', function ($rootScope, $scope, $http, modal) {
var myModal = new modal();
@@ -9,7 +9,7 @@ In this example, we will override the color and background for the first column

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -7,7 +7,7 @@ You can swap out data in the grid by simply providing a different reference.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', function ($scope) {
$scope.swapData = function() {
@@ -13,7 +13,7 @@ def properties), and call the notifyDataChange api to force an update.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
$scope.columns = [{ field: 'name' }, { field: 'gender' }];
@@ -8,7 +8,7 @@ You can add a row header column, which goes into the left pinned container
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.columns = [{ field: 'name' }, { field: 'gender' }];
@@ -9,7 +9,7 @@ set the background and foreground color of the header if the sort direction is A

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
$scope.gridOptions = {
@@ -7,7 +7,7 @@ The grid supports RTL languages
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -14,7 +14,7 @@ Demonstrates the following:
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = { };
@@ -7,7 +7,7 @@ Demonstrating scrolling with large amount of columns
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$timeout', function ($scope, $timeout) {
$scope.gridOptions = {
@@ -62,7 +62,7 @@ $scope.gridOptions.columnDefs = [
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.edit', 'addressFormatter']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.edit', 'addressFormatter']);

angular.module('addressFormatter', []).filter('address', function () {
return function (input) {
@@ -13,7 +13,7 @@ remembering the state of a page and scrolling back to that position when a user
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.cellNav', 'ui.grid.pinning']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.cellNav', 'ui.grid.pinning']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {};
@@ -9,7 +9,7 @@ It is also possible to disable pinning on column level. Note the 'id' column def
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.pinning']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.pinning']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {};
@@ -39,7 +39,7 @@ $scope.gridOptions = {
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.resizeColumns']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.resizeColumns']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -54,7 +54,7 @@ each save will take 3 seconds to complete. Any row saved with a gender of "male

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.edit', 'ui.grid.rowEdit', 'ui.grid.cellNav', 'addressFormatter']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.edit', 'ui.grid.rowEdit', 'ui.grid.cellNav', 'addressFormatter']);

angular.module('addressFormatter', []).filter('address', function () {
return function (input) {
@@ -19,7 +19,7 @@ In this example we use the native grid menu buttons, and we show both the pdf an

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid', 'ui.grid.selection', 'ui.grid.exporter']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid', 'ui.grid.selection', 'ui.grid.exporter']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -48,7 +48,7 @@ illustrates that doing so is not mandatory).

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid', 'ui.grid.importer']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid', 'ui.grid.importer']);

app.controller('MainCtrl', ['$scope', '$http', '$interval', function ($scope, $http, $interval) {
$scope.data = [];
@@ -41,7 +41,7 @@ Two examples are provided, the first with rowHeaderSelection and multi-select, t

<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.selection']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.selection']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {
@@ -8,7 +8,7 @@ each other.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.selection']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.selection']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {};
@@ -13,7 +13,7 @@ Specify percentage when lazy load should trigger:
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.infiniteScroll']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.infiniteScroll']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {};
@@ -11,7 +11,7 @@ To use, include the `'ui.grid.autoResize'` module in your angular app's dependen
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.autoResize']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.autoResize']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {};
@@ -7,7 +7,7 @@ When pagination is enabled, the data is displayed in pages that can be browsed u
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.pagination']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.pagination']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {};
@@ -7,7 +7,7 @@ When paging is enabled, the data is displayed in pages that can be browsed using
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.paging']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.paging']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -9,7 +9,7 @@ You can use [external scopes](/docs/#/tutorial/202_externalScopes) in your row t
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', '$timeout', '$interval', function ($scope, $http, $timeout, $interval) {
var start = new Date();
@@ -11,7 +11,7 @@ See api docs for default navigation keys and how you can override.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.edit', 'ui.grid.cellNav']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.edit', 'ui.grid.cellNav']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = { };
@@ -7,7 +7,7 @@ Create a grid almost the same as the most basic one, but with a custom header
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', function ($scope, $http) {
$scope.gridOptions = {
@@ -26,7 +26,7 @@ See the example below for usage.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ngAnimate', 'ui.grid']);
var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$http', 'uiGridConstants', function ($scope, $http, uiGridConstants) {
$scope.blargh = function() {
@@ -18,7 +18,7 @@ internationalization function that waits 1 second then prefixes each column with
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.exporter', 'ui.grid.selection']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.exporter', 'ui.grid.selection']);

app.controller('MainCtrl', ['$scope', '$http', '$interval', '$q', function ($scope, $http, $interval, $q) {
var fakeI18n = function( title ){
@@ -19,9 +19,9 @@ Then in a template, you access the scope using getExternalScopes() function.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid']);
var app = angular.module('app', ['ngTouch', 'ui.grid']);

app.controller('MainCtrl', ['$scope', '$log', function ($scope, $log) {
app.controller('MainCtrl', ['$scope', '$log', '$http', function ($scope, $log, $http) {

$scope.myViewModel = {
someProp:'abc',
@@ -33,12 +33,12 @@ Then in a template, you access the scope using getExternalScopes() function.
$scope.gridOptions = {};

$scope.gridOptions.columnDefs = [
{ name: 'firstName' },
{ name: 'lastName'},
{ name: 'name' },
{ name: 'gender'},
{ name: 'ShowScope',
cellTemplate:'<button class="btn primary" ng-click="getExternalScopes().showMe()">Click Me</button>' }
];

/*
$scope.gridOptions.data = [
{
"firstName": "Cox",
@@ -59,6 +59,13 @@ Then in a template, you access the scope using getExternalScopes() function.
"employed": false
}
];
*/

$http.get('/data/100.json')
.success(function(data) {
$scope.gridOptions.data = data;
});

}]);
</file>
<file name="index.html">
@@ -33,7 +33,7 @@ SubGrid nesting can be done upto multiple levels.
@example
<example module="app">
<file name="app.js">
var app = angular.module('app', ['ui.grid', 'ui.grid.expandable', 'ui.grid.selection', 'ui.grid.pinning']);
var app = angular.module('app', ['ngTouch', 'ui.grid', 'ui.grid.expandable', 'ui.grid.selection', 'ui.grid.pinning']);

app.controller('MainCtrl', ['$scope', '$http', '$log', function ($scope, $http, $log) {
$scope.gridOptions = {

No commit comments for this range

You can’t perform that action at this time.