Subversion Repositories SmartDukaan

Rev

Rev 1778 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1778 Rev 5145
Line 104... Line 104...
104 
          .css({
 104 
          .css({
105 
            'width': paneWidth + 'px',
 105 
            'width': paneWidth + 'px',
106 
            'height': paneHeight + 'px'
 106 
            'height': paneHeight + 'px'
107 
          }
 107 
          }
108 
          ).append(pane).appendTo(elem);
 108 
          ).append(pane).appendTo(elem);
109 
 
 - 
 
110 
        /*
 - 
 
111 
					// Move any margins from the first and last children up to the container so they can still
 - 
 
112 
					// collapse with neighbouring elements as they would before jScrollPane
- 
 
113 
					firstChild = pane.find(':first-child');
 - 
 
114 
					lastChild = pane.find(':last-child');
 - 
 
115 
					elem.css(
 - 
 
116 
						{
 - 
 
117 
							'margin-top': firstChild.css('margin-top'),
 - 
 
118 
							'margin-bottom': lastChild.css('margin-bottom')
 - 
 
119 
						}
 - 
 
120 
					);
 - 
 
121 
					firstChild.css('margin-top', 0);
 - 
 
122 
					lastChild.css('margin-bottom', 0);
 - 
 
123 
					*/
 - 
 
124 
        } else {
 109 
        } else {
125 
          elem.css('width', '');
 110 
          elem.css('width', '');
126 
 
 111 
 
127 
          hasContainingSpaceChanged = elem.innerWidth() + originalPaddingTotalWidth != paneWidth || elem.outerHeight() != paneHeight;
 112 
          hasContainingSpaceChanged = elem.innerWidth() + originalPaddingTotalWidth != paneWidth || elem.outerHeight() != paneHeight;
128 
 
 113 
 
Line 1242... Line 1227...
1242 
          ).bind(
 1227 
          ).bind(
1243 
          'touchend.jsp',
 1228 
          'touchend.jsp',
1244 
          function(e)
 1229 
          function(e)
1245 
          {
 1230 
          {
1246 
            moving = false;
 1231 
            moving = false;
1247 
          /*if(moved) {
 - 
 
1248 
							return false;
 - 
 
1249 
						}*/
 - 
 
1250 
          }
 1232 
          }
1251 
          ).bind(
 1233 
          ).bind(
1252 
          'click.jsp-touchclick',
 1234 
          'click.jsp-touchclick',
1253 
          function(e)
 1235 
          function(e)
1254 
          {
 1236 
          {