Skip to content
Browse files

Added ActivityIndicator and updated ScrollView style

  • Loading branch information...
1 parent 88f43a9 commit 4a77aa9e4327a4c63a3d97e5b50226595abefe3d @trabianmatt trabianmatt committed Feb 15, 2013
Showing with 43 additions and 3 deletions.
  1. +2 −1 ti/Makefile
  2. +28 −2 ti/dist.js
  3. +11 −0 ti/src/ui/views/activity_indicator.coffee
  4. +2 −0 ti/src/ui/views/scroll_view.coffee
View
3 ti/Makefile
@@ -7,6 +7,7 @@ build:
src/ui/index.coffee \
src/ui/views/base.coffee \
src/ui/iphone/index.coffee \
+ src/ui/views/activity_indicator.coffee \
src/ui/views/button.coffee \
src/ui/views/label.coffee \
src/ui/views/scroll_view.coffee \
@@ -23,4 +24,4 @@ build:
src/map/index.coffee \
src/map/view.coffee
-.PHONY: build
+.PHONY: build
View
30 ti/dist.js
@@ -1,5 +1,5 @@
-// Generated by CoffeeScript 1.3.3
-var Ti, Titanium, TitaniumButton, TitaniumButtonBar, TitaniumLabel, TitaniumMapAnnotationView, TitaniumMapView, TitaniumNavigationGroup, TitaniumScrollView, TitaniumSearchBar, TitaniumSwitch, TitaniumTab, TitaniumTabGroup, TitaniumTabbedBar, TitaniumTableView, TitaniumTableViewRow, TitaniumTextArea, TitaniumTextField, TitaniumView, TitaniumWebView, TitaniumWindow, locationServicesEnabled,
+// Generated by CoffeeScript 1.4.0
+var Ti, Titanium, TitaniumActivityIndicator, TitaniumButton, TitaniumButtonBar, TitaniumLabel, TitaniumMapAnnotationView, TitaniumMapView, TitaniumNavigationGroup, TitaniumScrollView, TitaniumSearchBar, TitaniumSwitch, TitaniumTab, TitaniumTabGroup, TitaniumTabbedBar, TitaniumTableView, TitaniumTableViewRow, TitaniumTextArea, TitaniumTextField, TitaniumView, TitaniumWebView, TitaniumWindow, locationServicesEnabled,
__hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
_this = this;
@@ -106,6 +106,30 @@ Ti.UI.iOS = {
}
};
+TitaniumActivityIndicator = (function(_super) {
+
+ __extends(TitaniumActivityIndicator, _super);
+
+ function TitaniumActivityIndicator() {
+ return TitaniumActivityIndicator.__super__.constructor.apply(this, arguments);
+ }
+
+ TitaniumActivityIndicator.prototype.show = function() {
+ return this.visible = true;
+ };
+
+ TitaniumActivityIndicator.prototype.hide = function() {
+ return this.visible = false;
+ };
+
+ return TitaniumActivityIndicator;
+
+})(TitaniumView);
+
+Ti.UI.createActivityIndicator = function(attributes) {
+ return new TitaniumActivityIndicator(attributes);
+};
+
TitaniumButton = (function(_super) {
__extends(TitaniumButton, _super);
@@ -170,6 +194,8 @@ TitaniumScrollView = (function(_super) {
return TitaniumScrollView.__super__.constructor.apply(this, arguments);
}
+ TitaniumScrollView.prototype.setContentHeight = function() {};
+
return TitaniumScrollView;
})(TitaniumView);
View
11 ti/src/ui/views/activity_indicator.coffee
@@ -0,0 +1,11 @@
+class TitaniumActivityIndicator extends TitaniumView
+
+ show: ->
+ @visible = true
+
+ hide: ->
+ @visible = false
+
+Ti.UI.createActivityIndicator = (attributes) ->
+
+ new TitaniumActivityIndicator attributes
View
2 ti/src/ui/views/scroll_view.coffee
@@ -1,5 +1,7 @@
class TitaniumScrollView extends TitaniumView
+ setContentHeight: ->
+
Ti.UI.createScrollView = (attributes) ->
new TitaniumScrollView attributes

0 comments on commit 4a77aa9

Please sign in to comment.
Something went wrong with that request. Please try again.