diff --git a/.gitignore b/.gitignore index 42da0c25b9..73026e7e91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store *.sw[mnpcod] +example/cordova/iOS/www/js/framework .sass-cache/ framework.sublime-project diff --git a/example/cordova/iOS/CodiqaProject.xcodeproj/project.xcworkspace/xcuserdata/driftyadmin.xcuserdatad/UserInterfaceState.xcuserstate b/example/cordova/iOS/CodiqaProject.xcodeproj/project.xcworkspace/xcuserdata/driftyadmin.xcuserdatad/UserInterfaceState.xcuserstate index d89d34032c..2b25aea40b 100644 Binary files a/example/cordova/iOS/CodiqaProject.xcodeproj/project.xcworkspace/xcuserdata/driftyadmin.xcuserdatad/UserInterfaceState.xcuserstate and b/example/cordova/iOS/CodiqaProject.xcodeproj/project.xcworkspace/xcuserdata/driftyadmin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/example/cordova/iOS/www/index.html b/example/cordova/iOS/www/index.html index efa477c117..78719ffd3f 100755 --- a/example/cordova/iOS/www/index.html +++ b/example/cordova/iOS/www/index.html @@ -6,30 +6,37 @@ +
-
- +
+ +
-
-

Feeds

-
- -
-
    -
  • - {{room.name}} -
    • -
-
+
+ +

Feeds

+
+ +
+
    +
  • + {{room.name}} +
    • +
+
+
+ + diff --git a/example/cordova/iOS/www/js/angular-1.2.0rc1.min.js b/example/cordova/iOS/www/js/angular-1.2.0rc1.min.js index eae90ee687..8c5e2d8e76 100644 --- a/example/cordova/iOS/www/js/angular-1.2.0rc1.min.js +++ b/example/cordova/iOS/www/js/angular-1.2.0rc1.min.js @@ -180,6 +180,3 @@ d.on("$destroy",function(){m.removeOption(e.value)})}}}}],ve=W({restrict:"E",ter isElement:Dc,isArray:I,$$minErr:M,version:Hd,isDate:Ea,lowercase:G,uppercase:Ba,callbacks:{counter:0}});Oa=Jc(T);try{Oa("ngLocale")}catch(c){Oa("ngLocale",[]).provider("$locale",hd)}Oa("ng",["ngLocale"],["$provide",function(b){b.provider("$compile",Xb).directive({a:Kd,input:yc,textarea:yc,form:Ld,script:re,select:te,style:ve,option:ue,ngBind:Wd,ngBindHtml:Yd,ngBindTemplate:Xd,ngClass:Zd,ngClassEven:ae,ngClassOdd:$d,ngCsp:de,ngCloak:be,ngController:ce,ngForm:Md,ngHide:le,ngIf:ee,ngInclude:fe,ngInit:ge, ngNonBindable:he,ngPluralize:ie,ngRepeat:je,ngShow:ke,ngStyle:me,ngSwitch:ne,ngSwitchWhen:oe,ngSwitchDefault:pe,ngOptions:se,ngTransclude:qe,ngModel:Rd,ngList:Td,ngChange:Sd,required:zc,ngRequired:zc,ngValue:Vd}).directive(Eb).directive(Ac);b.provider({$anchorScroll:Sc,$animate:Jd,$browser:Vc,$cacheFactory:Wc,$controller:$c,$document:ad,$exceptionHandler:bd,$filter:nc,$interpolate:gd,$http:cd,$httpBackend:dd,$location:jd,$log:kd,$parse:od,$rootScope:rd,$q:pd,$sce:td,$sceDelegate:sd,$sniffer:ud,$templateCache:Xc, $timeout:vd,$window:xd,$$urlUtils:wd})}])})(Ha);C(N).ready(function(){Hc(N,Mb)})})(window,document);angular.element(document).find("head").prepend(''); -/* -//@ sourceMappingURL=angular.min.js.map -*/ diff --git a/example/cordova/iOS/www/js/app.js b/example/cordova/iOS/www/js/app.js index ba4d1733dd..937ef823d5 100644 --- a/example/cordova/iOS/www/js/app.js +++ b/example/cordova/iOS/www/js/app.js @@ -1,9 +1,20 @@ -var chat = angular.module('Chat', []); +var chat = angular.module('Chat', ['ngTouch']); + +chat.controller('MenuCtrl', function($scope) { +}); chat.controller('RoomsCtrl', function($scope) { $scope.rooms = [ { name: 'All', key: 'all' }, { name: 'Marketing', key: 'marketing' } ]; + + $scope.openPanel = function() { + $scope.isPanelShowing = true; + }; + + $scope.showAlert = function() { + alert("WHAT"); + } }); diff --git a/scss/framework/structure/_panel.scss b/scss/framework/structure/_panel.scss index c58642efa2..953b192f82 100644 --- a/scss/framework/structure/_panel.scss +++ b/scss/framework/structure/_panel.scss @@ -52,4 +52,4 @@ -webkit-transform: translate3d( ($panelOpenWidth * -1), 0,0 ); -moz-transform: translate3d( ($panelOpenWidth * -1), 0,0 ); transform: translate3d( ($panelOpenWidth * -1), 0,0 ); -} \ No newline at end of file +}