Permalink
Browse files

new images

  • Loading branch information...
1 parent 85bdca9 commit 7fa0f04c2f59ecbaab29ed965a22873e0314ee82 The Map Office committed Sep 13, 2010
Showing with 21 additions and 17 deletions.
  1. BIN Resources/.DS_Store
  2. +1 −0 Resources/bioview.js
  3. +7 −4 Resources/gridview.js
  4. BIN Resources/images/.DS_Store
  5. BIN Resources/images/eddie/.DS_Store
  6. BIN Resources/images/eddie/88_morning_1943.jpg
  7. BIN Resources/images/eddie/88_morning_1947.jpg
  8. BIN Resources/images/eddie/88_morningside_1909.jpg
  9. BIN Resources/images/eddie/88_morningside_1909a.jpg
  10. BIN Resources/images/eddie/88_morningside_1943.jpg
  11. BIN Resources/images/eddie/88_morningside_1947.jpg
  12. BIN Resources/images/eddie/AB002_IMG_1993_rev.jpg
  13. BIN Resources/images/eddie/AB002_IMG_2078_rev.jpg
  14. BIN Resources/images/eddie/DB001_final_logomark.jpg
  15. BIN Resources/images/eddie/FM003_fl35_south.jpg
  16. BIN Resources/images/eddie/FM007_3T6W2837.jpg
  17. BIN Resources/images/eddie/FM007_3T6W2842.jpg
  18. BIN Resources/images/eddie/FM007_3T6W2844.jpg
  19. BIN Resources/images/eddie/HB002_jet_final_mark.jpg
  20. BIN Resources/images/eddie/IMG_1450v_3.jpg
  21. BIN Resources/images/eddie/IMG_1458_v2.jpg
  22. BIN Resources/images/eddie/IMG_1467_v2.jpg
  23. BIN Resources/images/eddie/IMG_1474_v2.jpg
  24. BIN Resources/images/eddie/JW002_cover_00010.jpg
  25. BIN Resources/images/eddie/JW005_JWThimself.jpg
  26. BIN Resources/images/eddie/KH001_genesis_mark.jpg
  27. BIN Resources/images/eddie/MA001_mediaTab.jpg
  28. BIN Resources/images/eddie/MA001_new_mig_logo_2.jpg
  29. BIN Resources/images/eddie/Picture-16.jpg
  30. BIN Resources/images/eddie/bfcm_logomark.jpg
  31. BIN Resources/images/eddie/cluster_noscale.jpg
  32. BIN Resources/images/eddie/glennligon_1.jpg
  33. BIN Resources/images/eddie/glennligon_3.jpg
  34. BIN Resources/images/eddie/glennligon_9.jpg
  35. BIN Resources/images/eddie/howto.jpg
  36. BIN Resources/images/eddie/jet_web_12.jpg
  37. BIN Resources/images/eddie/jet_web_13.jpg
  38. BIN Resources/images/eddie/jwt_1.jpg
  39. BIN Resources/images/eddie/main.jpg
  40. BIN Resources/images/eddie/map.jpg
  41. BIN Resources/images/eddie/map_so_logomark_color.jpg
  42. BIN Resources/images/eddie/matin_3.jpg
  43. BIN Resources/images/eddie/matin_7.jpg
  44. BIN Resources/images/eddie/matin_kurtz_2.jpg
  45. BIN Resources/images/eddie/matin_kurtz_3.jpg
  46. BIN Resources/images/eddie/matin_mark.jpg
  47. BIN Resources/images/eddie/narcotics_10.jpg
  48. BIN Resources/images/eddie/narcotics_3.jpg
  49. BIN Resources/images/eddie/narcotics_5.jpg
  50. BIN Resources/images/eddie/narcotics_8.jpg
  51. BIN Resources/images/eddie/north.jpg
  52. BIN Resources/images/eddie/osl_10.jpg
  53. BIN Resources/images/eddie/search_nodropdown.jpg
  54. BIN Resources/images/eddie/sorg_mark.jpg
  55. BIN Resources/images/eddie/stealth_3.jpg
  56. BIN Resources/images/eddie/stealth_7.jpg
  57. BIN Resources/images/eddie/stealth_8.jpg
  58. BIN Resources/images/eddie/str2.jpg
  59. BIN Resources/images/eddie/stregis_2.jpg
  60. BIN Resources/images/eddie/stregis_3.jpg
  61. BIN Resources/images/eddie/studio_obama.jpg
  62. BIN Resources/images/eddie/studiomag_summ08_2.jpg
  63. BIN Resources/images/eddie/studiomag_summ08_3.jpg
  64. BIN Resources/images/eddie/studiomag_summ08_4.jpg
  65. BIN Resources/images/eddie/thebaffler_mark.jpg
  66. BIN Resources/images/eddie/thumbs/.DS_Store
  67. BIN Resources/images/eddie/thumbs/88_morning_1943.jpg
  68. BIN Resources/images/eddie/thumbs/88_morning_1947.jpg
  69. BIN Resources/images/eddie/thumbs/AB002_IMG_1993_rev.jpg
  70. BIN Resources/images/eddie/thumbs/AB002_IMG_2078_rev.jpg
  71. BIN Resources/images/eddie/thumbs/DB001_final_logomark.jpg
  72. BIN Resources/images/eddie/thumbs/FM003_fl35_south.jpg
  73. BIN Resources/images/eddie/thumbs/FM007_3T6W2837.jpg
  74. BIN Resources/images/eddie/thumbs/FM007_3T6W2842.jpg
  75. BIN Resources/images/eddie/thumbs/FM007_3T6W2844.jpg
  76. BIN Resources/images/eddie/thumbs/HB002_jet_final_mark.jpg
  77. BIN Resources/images/eddie/thumbs/IMG_1458_v2.jpg
  78. BIN Resources/images/eddie/thumbs/IMG_1467_v2.jpg
  79. BIN Resources/images/eddie/thumbs/IMG_1474_v2.jpg
  80. BIN Resources/images/eddie/thumbs/JW002_cover_00010.jpg
  81. BIN Resources/images/eddie/thumbs/JW005_JWThimself.jpg
  82. BIN Resources/images/eddie/thumbs/KH001_genesis_mark.jpg
  83. BIN Resources/images/eddie/thumbs/MA001_mediaTab.jpg
  84. BIN Resources/images/eddie/thumbs/MA001_new_mig_logo_2.jpg
  85. BIN Resources/images/eddie/thumbs/Web
  86. BIN Resources/images/eddie/thumbs/bfcm_logomark.jpg
  87. BIN Resources/images/eddie/thumbs/cluster_noscale.jpg
  88. BIN Resources/images/eddie/thumbs/glennligon_1.jpg
  89. BIN Resources/images/eddie/thumbs/glennligon_3.jpg
  90. BIN Resources/images/eddie/thumbs/glennligon_9.jpg
  91. BIN Resources/images/eddie/thumbs/howto.jpg
  92. BIN Resources/images/eddie/thumbs/jet_web_12.jpg
  93. BIN Resources/images/eddie/thumbs/jet_web_13.jpg
  94. BIN Resources/images/eddie/thumbs/jwt_1.jpg
  95. BIN Resources/images/eddie/thumbs/main.jpg
  96. BIN Resources/images/eddie/thumbs/main.png
  97. BIN Resources/images/eddie/thumbs/map.jpg
  98. BIN Resources/images/eddie/thumbs/map_so_logomark_color.jpg
  99. BIN Resources/images/eddie/thumbs/matin_3.jpg
  100. BIN Resources/images/eddie/thumbs/matin_7.jpg
  101. BIN Resources/images/eddie/thumbs/matin_kurtz_2.jpg
  102. BIN Resources/images/eddie/thumbs/matin_kurtz_3.jpg
  103. BIN Resources/images/eddie/thumbs/matin_mark.jpg
  104. BIN Resources/images/eddie/thumbs/narcotics_10.jpg
  105. BIN Resources/images/eddie/thumbs/narcotics_3.jpg
  106. BIN Resources/images/eddie/thumbs/narcotics_5.jpg
  107. BIN Resources/images/eddie/thumbs/narcotics_8.jpg
  108. BIN Resources/images/eddie/thumbs/north.jpg
  109. BIN Resources/images/eddie/thumbs/osl_10.jpg
  110. BIN Resources/images/eddie/thumbs/search_nodropdown.jpg
  111. BIN Resources/images/eddie/thumbs/search_nodropdown.png
  112. BIN Resources/images/eddie/thumbs/shot_by_fans-16.jpg
  113. BIN Resources/images/eddie/thumbs/shot_by_fans-16.png
  114. BIN Resources/images/eddie/thumbs/sorg_mark.jpg
  115. BIN Resources/images/eddie/thumbs/stealth_3.jpg
  116. BIN Resources/images/eddie/thumbs/stealth_7.jpg
  117. BIN Resources/images/eddie/thumbs/stealth_8.jpg
  118. BIN Resources/images/eddie/thumbs/str2.jpg
  119. BIN Resources/images/eddie/thumbs/stregis_2.jpg
  120. BIN Resources/images/eddie/thumbs/stregis_3.jpg
  121. BIN Resources/images/eddie/thumbs/studio_obama.jpg
  122. BIN Resources/images/eddie/thumbs/studiomag_summ08_3.jpg
  123. BIN Resources/images/eddie/thumbs/studiomag_summ08_4.jpg
  124. BIN Resources/images/eddie/thumbs/thebaffler_mark.jpg
  125. BIN Resources/images/eddie/thumbs/tic_toc_redo_3.jpg
  126. BIN Resources/images/eddie/thumbs/ucla_2.jpg
  127. BIN Resources/images/eddie/thumbs/ucla_homepage.jpg
  128. BIN Resources/images/eddie/thumbs/ucla_new_2.jpg
  129. BIN Resources/images/eddie/thumbs/ucla_new_4.jpg
  130. BIN Resources/images/eddie/thumbs/ucla_new_7.jpg
  131. BIN Resources/images/eddie/thumbs/ucla_site3.jpg
  132. BIN Resources/images/eddie/thumbs/uclacatalog_2.jpg
  133. BIN Resources/images/eddie/thumbs/uclacatalog_4.jpg
  134. BIN Resources/images/eddie/tic_toc_redo_3.jpg
  135. BIN Resources/images/eddie/ucla_2.jpg
  136. BIN Resources/images/eddie/ucla_homepage.jpg
  137. BIN Resources/images/eddie/ucla_new_2.jpg
  138. BIN Resources/images/eddie/ucla_new_4.jpg
  139. BIN Resources/images/eddie/ucla_new_7.jpg
  140. BIN Resources/images/eddie/ucla_site3.jpg
  141. BIN Resources/images/eddie/uclacatalog_2.jpg
  142. BIN Resources/images/eddie/uclacatalog_4.jpg
  143. +13 −13 Resources/slideshow.js
View
Binary file not shown.
View
@@ -23,6 +23,7 @@ var bioField = Titanium.UI.createTextArea({
width:'100%',
shadowColor:'#aaa',
editable: false,
+ maxZoomScale:2,
backgroundColor: '#000',
borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED
});
View
@@ -51,6 +51,7 @@ var resources = JSON.parse(f.read().text);
+/*
function adjustImages() {
for(var i=0;i<images.length;i++) {
@@ -60,6 +61,7 @@ function adjustImages() {
img.height = 70;
}
}
+*/
@@ -168,7 +170,6 @@ for (var i=0;i<resources.images.length;i++) {
var image = resources.images[i];
var imageView = Titanium.UI.createImageView({
image: partner.dir+'thumbs/'+image.name,
- opacity:0,
/* image: 'images/icons/icon_arrow_left.png', */
width:70,height:70,top:y,left:x,canScale:true
});
@@ -185,8 +186,10 @@ for (var i=0;i<resources.images.length;i++) {
barColor:'#111'
});
slideShow.orientationModes = [
- Titanium.UI.PORTRAIT,
- Titanium.UI.UPSIDE_PORTRAIT
+ Titanium.UI.PORTRAIT,
+ Titanium.UI.LANDSCAPE_LEFT,
+ Titanium.UI.LANDSCAPE_RIGHT,
+ Titanium.UI.UPSIDE_PORTRAIT
];
slideShow.index = e.source.index;
slideShow.hideTabBar()
@@ -205,7 +208,7 @@ for (var i=0;i<resources.images.length;i++) {
}
win.add(scrollView);
-setTimeout(adjustImages,200);
+//setTimeout(adjustImages,200);
Ti.Gesture.addEventListener('orientationchange',function(e){
info.image = 'images/icons/19-gear.png';
View
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
View
@@ -59,7 +59,7 @@ var rowData = resources.partner;
win.title = (win.index+1) + ' / ' + imagesArr.length;
-/*
+
var loadingScreen = Titanium.UI.createActivityIndicator({
height:50,
@@ -71,7 +71,7 @@ var loadingScreen = Titanium.UI.createActivityIndicator({
});
loadingScreen.show();
win.add(loadingScreen);
-*/
+
@@ -84,17 +84,18 @@ function adjustCurrentImage() {
prev.image = 'images/icons/icon_arrow_left.png';
next.image = 'images/icons/icon_arrow_right.png';
info.image = 'images/icons/19-gear.png';
- /*
-var start = win.index-1;
+
+ var start = win.index-1;
if(win.index == 0)
start = 0;
-*/
-
+
+
+ var img = imageViews[win.index].child;
+ scrollView.contentWidth
for(var i=0;i<imagesArr.length;i++) {
var img = imageViews[i].child;
var ratio = imagesArr[i].wratio / imagesArr[i].hratio;
- //Ti.API.info(imagesArr[i].wratio+' '+imagesArr[i].hratio);
if(OR == 3 || OR == 4) {
img.height = 320;
@@ -107,10 +108,10 @@ var start = win.index-1;
}
- imageViews[win.index].child.opacity = 1;
+ //imageViews[win.index].child.opacity = 1;
if(first) {
- //loadingScreen.hide();
- //win.remove(loadingScreen);
+ loadingScreen.hide();
+ win.remove(loadingScreen);
first = false;
}
}
@@ -181,8 +182,7 @@ for(var i=0;i<imagesArr.length;i++) {
else
op = 1;
var imageView = Titanium.UI.createImageView({
- image: rowData.dir+imagesArr[i].name,
- width:w,height:h,opacity:op
+ image: rowData.dir+imagesArr[i].name,width:w,height:h
});
imageView.ratio = ratio;
holder.add(imageView);
@@ -291,7 +291,7 @@ Ti.Gesture.addEventListener('orientationchange',function(e)
Ti.API.info("ORIENTATION======="+e.orientation);
OR = e.orientation;
- //adjustCurrentImage();
+ adjustCurrentImage();
if(playing == false && toolBarVisible == true) {
if(OR == 3 || OR == 4) {

0 comments on commit 7fa0f04

Please sign in to comment.