Skip to content
This repository has been archived by the owner on Aug 18, 2021. It is now read-only.

Commit

Permalink
Update to work with ST 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchellsimoens
mitchellsimoens committed May 9, 2013
1 parent 17dc697 commit e66f673
Show file tree
Hide file tree
Showing 2,779 changed files with 350,490 additions and 272,145 deletions.
7 changes: 5 additions & 2 deletions Ext.ux.touch.grid/List.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Ext.define('Ext.ux.touch.grid.List', {
},

_updateItemTpl: function(newTpl) {
var listItems = this.listItems,
var listItems = this.listItems || [],
ln = listItems.length || 0,
store = this.getStore(),
i, listItem;
Expand Down Expand Up @@ -184,6 +184,7 @@ Ext.define('Ext.ux.touch.grid.List', {
defaults = me.getDefaults() || {},
rowCls = me.getRowCls(),
rowStyle = me.getRowStyle(),
itemHeight = this.getItemHeight ? this.getItemHeight() : false,
column, hidden, css, styles, attributes, width, renderer, rendererName, innerText;

for (; c < cNum; c++) {
Expand All @@ -201,7 +202,9 @@ Ext.define('Ext.ux.touch.grid.List', {
renderer = column[header ? 'headerRenderer' : 'renderer'] || this._defaultRenderer;
rendererName = column.dataIndex + '_renderer';

styles.push('line-height: '+this.getItemHeight()+'px;');
if (itemHeight) {
styles.push('line-height: ' + itemHeight + 'px;');
}

if (header) {
css.push(basePrefix + 'grid-cell-hd');
Expand Down
17 changes: 0 additions & 17 deletions Ext.ux.touch.grid/View.js
View file

This file was deleted.

5 changes: 5 additions & 0 deletions Ext.ux.touch.grid/feature/Sorter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ Ext.define('Ext.ux.touch.grid.feature.Sorter', {
dataIndex = sorter.getProperty();
dir = sorter.getDirection();
column = grid.getColumn(dataIndex);

if (!column) {
continue;
}

colEl = column.element;

if (!colEl) {
Expand Down
6 changes: 3 additions & 3 deletions checkbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='checkbox.js'></script>

Expand Down
6 changes: 3 additions & 3 deletions editable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='editable.js'></script>

Expand Down
3 changes: 2 additions & 1 deletion editable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ Ext.require([
'Ext.ux.touch.grid.List',
'Ext.ux.touch.grid.feature.Feature',
'Ext.ux.touch.grid.feature.Editable',
'Ext.ux.touch.grid.feature.Sorter'
'Ext.ux.touch.grid.feature.Sorter',
'Ext.field.Text'
]);

Ext.setup({
Expand Down
6 changes: 3 additions & 3 deletions horizontal.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid - Horizontal Scrolling</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='horizontal.js'></script>

Expand Down
6 changes: 3 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='index.js'></script>

Expand Down
6 changes: 3 additions & 3 deletions infinite.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='infinite.js'></script>

Expand Down
1 change: 1 addition & 0 deletions infinite.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Ext.setup({
Ext.create('Ext.ux.touch.grid.List', {
fullscreen : true,
store : store,
infinite : true,
columns : [
{
header : 'Title',
Expand Down
6 changes: 3 additions & 3 deletions listplugins.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='listplugins.js'></script>

Expand Down
6 changes: 3 additions & 3 deletions meta.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<title>Ext.ux.touch.grid</title>
<link rel="stylesheet" href="../sencha-touch-2.1.0-gpl/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../sencha-touch-2.1.0-gpl/sencha-touch-debug.js"></script>
<link rel="stylesheet" href="../touch-2.2.0/resources/css/sencha-touch.css" type="text/css">
<script type="text/javascript" src="../touch-2.2.0/sencha-touch-debug.js"></script>

<link rel="stylesheet" href="resources/css/Ext.ux.grid.View.css" type="text/css">
<link rel="stylesheet" href="resources/css/Ext.ux.grid.List.css" type="text/css">

<script type="text/javascript" src='meta.js'></script>

Expand Down
Loading

0 comments on commit e66f673

Please sign in to comment.