Jamon Holmgren
189e1e154e
Merge pull request #165 from clearsightstudio/refactor_folder_structure
...
Refactor folder structure, remove pm_main_controller monkey-patch
2013-06-24 23:10:13 -07:00
Jamon Holmgren
4986724263
Merge branch 'version-1.0' into refactor_folder_structure
2013-06-24 23:01:55 -07:00
Jamon Holmgren
a7fc8e3fc0
Fix for issue #167 , tab bar tests.
2013-06-24 22:58:16 -07:00
Jamon Holmgren
600106475f
Merge pull request #166 from clearsightstudio/webscreen-data-detectors
...
Webscreen data detectors
2013-06-24 10:38:03 -07:00
Mark Rickert
5ca392fe0f
Move detector types into the set_attributes of the webscreen.
2013-06-23 15:05:39 -04:00
Mark Rickert
1066e08ba0
Merge branch 'refs/heads/version-1.0' into webscreen-data-detectors
...
* refs/heads/version-1.0:
Fixed failing test
Ensuring background image is settable
Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159 on MASTER branch.
Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159
2013-06-23 14:54:48 -04:00
Jamon Holmgren
1add1bc093
Passing test
2013-06-21 23:43:11 -07:00
Jamon Holmgren
648cc87930
Removing main_controller references
2013-06-21 23:33:12 -07:00
Jamon Holmgren
3dcf2a251e
removing dependency on monkey-patching UIViewController
2013-06-21 22:55:45 -07:00
Jamon Holmgren
e81a4f6240
Fixed failing test
2013-06-21 22:21:32 -07:00
Jamon Holmgren
85c5a1ec3d
Merge branch 'version-1.0' of https://github.com/clearsightstudio/ProMotion into version-1.0
2013-06-21 21:57:43 -07:00
Jamon Holmgren
230f8829c8
Merge pull request #160 from clearsightstudio/search-tableindex
...
Fix for table index and search field item
2013-06-21 21:57:33 -07:00
Jamon Holmgren
fba5b89246
Merge branch 'master' of https://github.com/clearsightstudio/ProMotion into version-1.0
2013-06-21 21:56:13 -07:00
Mark Rickert
5c6d6c0756
Allow the user to specify the kind of autodetection the want to use in the WebScreen. Defaults to none.
2013-06-19 23:03:01 -04:00
Jamon Holmgren
542da8bc73
Ensuring background image is settable
2013-06-19 00:25:10 -07:00
Jamon Holmgren
d6e4c88ae3
Merge pull request #163 from clearsightstudio/web-evaluate-javascript
...
Web evaluate javascript
2013-06-18 14:25:29 -07:00
Jamon Holmgren
8609e1b22e
Merge pull request #162 from clearsightstudio/search-tableindex-master
...
Scroll the tableview all the way to the top when there's a search field ...
2013-06-18 14:24:34 -07:00
Mark Rickert
1e68044cd1
Add working test for evaluating javascript on the WebScreen
2013-06-18 16:57:54 -04:00
Mark Rickert
7b2ea668c5
Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159 on MASTER branch.
2013-06-18 16:49:06 -04:00
Mark Rickert
2b2c5c6b6a
Helper method to evaluate a javascript string in WebScreen.
2013-06-18 16:36:19 -04:00
Mark Rickert
9cd51c9f5e
Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159
2013-06-18 13:09:16 -04:00
Jamon Holmgren
545485bdb9
Merge pull request #158 from hellopatrick/hello_improvements
...
Standardize setup method.
2013-06-18 08:58:35 -07:00
Patrick Rogers
f6eb92b9d4
Change setup to screen_setup.
2013-06-18 04:05:24 -04:00
Patrick Rogers
e1bc62d25e
Standarize setup method.
...
Instead of table_setup, web_setup, map_setup, etc..., just call a
standard setup method.
2013-06-17 22:48:39 -04:00
Jamon Holmgren
8cf4c15067
Merge pull request #155 from clearsightstudio/webscreen-tests
...
Webscreen tests
2013-06-17 17:04:02 -07:00
Mark Rickert
22b7105e2e
Removed useless commented out code in specs.
2013-06-17 19:15:17 -04:00
Mark Rickert
abcccaf9a2
Some awesome WebScreen tests.
2013-06-17 19:10:26 -04:00
Mark Rickert
aa2f43a132
Allow setting content after the fact with "set_content" and make the initial content use that method.
2013-06-17 19:07:18 -04:00
Mark Rickert
ae1cb6b716
Add method to get the html of the webview.
2013-06-17 19:06:53 -04:00
Jamon Holmgren
930c88439f
Merge pull request #152 from clearsightstudio/webscreen
...
Initial Webscreen Support
2013-06-17 15:07:48 -07:00
Mark Rickert
6028acc27b
Merge branch 'refs/heads/version-1.0' into webscreen
...
* refs/heads/version-1.0:
Removed unnecessary and commented out code from the map spec.
Simplify the code for adding annotations.
Better params handling for initializing an annotation.
Rename to support 1.0 folder structure.
Convert all CLLocationCoordinate2DMake calls to CLLocationCoordinate2D.new
Unit & Functional tests for MapScreen. All tests passing.
Big red error message if CoreLocation and MapKit aren't included frameworks.
Add corelocation and mapkit to the project rakefile.
Get and set center position of the map.
Decided against the metaprogramming for now.
Added args to add_nav_bar call in ProMotion::ScreenModule
Why was this .DS_Store file here?
Metaprogramming FTW!
Don't *require* a subtitle to be set in the annotation.
First attempt at providing a more "table_data" like DSL for the mapkit annotations.
Fixed but in adding multiple annotations.
Better defaults handling in the MapScreenAnnotation.
Handle annotations, regions and zooming to coordinates.
Support annotations.
Initial mapview module working and setting initial location.
Conflicts:
lib/ProMotion/screen/screen_module.rb
2013-06-17 18:04:09 -04:00
Jamon Holmgren
4de8094f92
Merge pull request #151 from clearsightstudio/mapview-screen
...
Mapview screen
2013-06-17 14:55:04 -07:00
Mark Rickert
4d77f0f943
Removed unnecessary and commented out code from the map spec.
2013-06-17 17:01:27 -04:00
Mark Rickert
dac6ebe9eb
Simplify the code for adding annotations.
2013-06-17 16:59:21 -04:00
Mark Rickert
1cc1e35128
Better params handling for initializing an annotation.
2013-06-17 16:55:00 -04:00
Mark Rickert
e27fdbe6f5
Make the developer explicitly specify an NSURL instance when they want to show external content.
2013-06-17 13:23:31 -04:00
Mark Rickert
c2457ceed3
Fix URLWithString typo.
2013-06-17 13:01:15 -04:00
Mark Rickert
b868e0df2f
Moved camelCase methods to the bottom of the class.
2013-06-17 13:00:41 -04:00
Mark Rickert
e12cddb391
Rename to support 1.0 folder structure.
2013-06-16 15:16:24 -04:00
Mark Rickert
b928ce9064
Merge branch 'version-1.0' of github.com:clearsightstudio/ProMotion into mapview-screen
...
# By Jamon Holmgren
# Via Jamon Holmgren
* 'version-1.0' of github.com:clearsightstudio/ProMotion:
Tests are PASSING!
Problems with accessory views
Unit tests mostly working
Massive refactor/rename. Specs are failing on this one with no error message.
Conflicts:
Rakefile
2013-06-16 15:15:34 -04:00
Mark Rickert
13242da560
Pull in version 1.0 and rename a few things.
2013-06-16 15:14:34 -04:00
Mark Rickert
5e0fe6e24d
Merge branch 'version-1.0' of github.com:clearsightstudio/ProMotion into webscreen
...
# By Jamon Holmgren
# Via Jamon Holmgren
* 'version-1.0' of github.com:clearsightstudio/ProMotion:
Tests are PASSING!
Problems with accessory views
Unit tests mostly working
Massive refactor/rename. Specs are failing on this one with no error message.
2013-06-16 15:13:04 -04:00
Mark Rickert
6c873fb9b4
Support opening links in chrome if installed on the users' devices. Add pod 'OpenInChrome' to the rakefile to enable this as the default behavior.
2013-06-16 15:05:19 -04:00
Mark Rickert
8c4c7ce8f6
Only go forward or back if we can.
2013-06-16 14:50:43 -04:00
Mark Rickert
8b3c939327
Initial Support for PM::WebScreen
2013-06-16 14:32:15 -04:00
Mark Rickert
0a19bae3cf
Convert all CLLocationCoordinate2DMake calls to CLLocationCoordinate2D.new
2013-06-16 14:04:21 -04:00
Mark Rickert
96c3d112e7
Unit & Functional tests for MapScreen. All tests passing.
2013-06-16 12:55:01 -04:00
Mark Rickert
6cbf3a1b97
Big red error message if CoreLocation and MapKit aren't included frameworks.
2013-06-16 12:54:46 -04:00
Mark Rickert
d3744204e3
Add corelocation and mapkit to the project rakefile.
2013-06-16 12:44:14 -04:00
Mark Rickert
f05dd210b9
Get and set center position of the map.
2013-06-16 11:22:46 -04:00
