Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
ab4d024b
提交
ab4d024b
authored
9月 15, 2015
作者:
Ken Rice
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-8183 #resolve #comment add google api logins to Verto Communicator
上级
c9bb3a2a
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
58 行增加
和
6 行删除
+58
-6
bower.json
html5/verto/verto_communicator/bower.json
+1
-0
index.html
html5/verto/verto_communicator/src/index.html
+2
-1
login.html
html5/verto/verto_communicator/src/partials/login.html
+9
-3
vertoApp.module.js
.../verto/verto_communicator/src/vertoApp/vertoApp.module.js
+2
-1
LoginController.js
...cator/src/vertoControllers/controllers/LoginController.js
+6
-1
MainController.js
...icator/src/vertoControllers/controllers/MainController.js
+38
-0
没有找到文件。
html5/verto/verto_communicator/bower.json
浏览文件 @
ab4d024b
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
"angular-prompt"
:
"~1.1.1"
,
"angular-prompt"
:
"~1.1.1"
,
"angular-animate"
:
"~1.3.15"
,
"angular-animate"
:
"~1.3.15"
,
"angular-cookies"
:
"~1.3.15"
,
"angular-cookies"
:
"~1.3.15"
,
"angular-directive.g-signin"
:
"~0.1.2"
,
"jquery"
:
"~2.1.4"
,
"jquery"
:
"~2.1.4"
,
"angular-fullscreen"
:
"~1.0.1"
,
"angular-fullscreen"
:
"~1.0.1"
,
"ngstorage"
:
"~0.3.9"
,
"ngstorage"
:
"~0.3.9"
,
...
...
html5/verto/verto_communicator/src/index.html
浏览文件 @
ab4d024b
...
@@ -71,6 +71,7 @@
...
@@ -71,6 +71,7 @@
<script
src=
"bower_components/angular-prompt/dist/angular-prompt.js"
></script>
<script
src=
"bower_components/angular-prompt/dist/angular-prompt.js"
></script>
<script
src=
"bower_components/angular-animate/angular-animate.js"
></script>
<script
src=
"bower_components/angular-animate/angular-animate.js"
></script>
<script
src=
"bower_components/angular-cookies/angular-cookies.js"
></script>
<script
src=
"bower_components/angular-cookies/angular-cookies.js"
></script>
<script
src=
"bower_components/angular-directive.g-signin/google-plus-signin.js"
></script>
<script
src=
"bower_components/angular-fullscreen/src/angular-fullscreen.js"
></script>
<script
src=
"bower_components/angular-fullscreen/src/angular-fullscreen.js"
></script>
<script
src=
"bower_components/ngstorage/ngStorage.js"
></script>
<script
src=
"bower_components/ngstorage/ngStorage.js"
></script>
<script
src=
"bower_components/momentjs/moment.js"
></script>
<script
src=
"bower_components/momentjs/moment.js"
></script>
...
@@ -121,9 +122,9 @@
...
@@ -121,9 +122,9 @@
<script
type=
"text/javascript"
src=
"src/storageService/storageService.module.js"
></script>
<script
type=
"text/javascript"
src=
"src/storageService/storageService.module.js"
></script>
<script
type=
"text/javascript"
src=
"src/storageService/services/storage.js"
></script>
<script
type=
"text/javascript"
src=
"src/storageService/services/storage.js"
></script>
<script
type=
"text/javascript"
src=
"src/storageService/services/call_history.js"
></script>
<script
type=
"text/javascript"
src=
"src/storageService/services/call_history.js"
></script>
<!-- endbuild -->
<!-- endbuild -->
</body>
</body>
</html>
</html>
html5/verto/verto_communicator/src/partials/login.html
浏览文件 @
ab4d024b
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<h3>
Login
</h3>
<h3>
Login
</h3>
<div
ng-show=
"form.$submitted && form.$invalid"
class=
"alert alert-danger"
>
<div
ng-show=
"form.$submitted && form.$invalid"
class=
"alert alert-danger"
>
<p>
Verify the fields bellow and try again.
</p>
<p>
Verify the fields bellow and try again.
</p>
</div>
</div>
...
@@ -45,9 +46,14 @@
...
@@ -45,9 +46,14 @@
<input
type=
"text"
class=
"form-control"
id=
"login-password"
placeholder=
"Password"
ng-model=
"verto.data.password"
>
<input
type=
"text"
class=
"form-control"
id=
"login-password"
placeholder=
"Password"
ng-model=
"verto.data.password"
>
</div>
</div>
<div
class=
"form-group text-right"
>
<a
style=
"margin-top: 13px;"
href=
""
ng-click=
"advanced = !advanced"
class=
"pull-left"
>
Settings
</a>
<div
class=
"form-group text-right"
>
<button
type=
"submit"
class=
"btn btn-success"
ng-click=
"(form.$valid && login())"
>
Login
</button>
<div><a
style=
"margin-top: 13px;"
href=
""
ng-click=
"advanced = !advanced"
class=
"pull-left"
>
Settings
</a></div>
<div><button
type=
"submit"
class=
"btn btn-success"
ng-click=
"(form.$valid && login())"
>
Login
</button></div>
<div
ng-if=
"googlelogin"
class=
"centered-block"
>
<google-plus-signin
clientid=
"675954646436-cuejgg314a32s2c76dnc2n7ier3kbudu.apps.googleusercontent.com"
class=
"center"
>
</google-plus-signin>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
...
...
html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
浏览文件 @
ab4d024b
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
'cgPrompt'
,
'cgPrompt'
,
'720kb.tooltips'
,
'720kb.tooltips'
,
'ui.gravatar'
,
'ui.gravatar'
,
'directive.g+signin'
,
]);
]);
vertoApp
.
config
([
'$routeProvider'
,
'gravatarServiceProvider'
,
vertoApp
.
config
([
'$routeProvider'
,
'gravatarServiceProvider'
,
...
@@ -95,4 +96,4 @@
...
@@ -95,4 +96,4 @@
}
}
]);
]);
})();
})();
\ No newline at end of file
html5/verto/verto_communicator/src/vertoControllers/controllers/LoginController.js
浏览文件 @
ab4d024b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
angular
angular
.
module
(
'vertoControllers'
)
.
module
(
'vertoControllers'
)
.
controller
(
'LoginController'
,
[
'$scope'
,
'$http'
,
'$location'
,
'verto'
,
.
controller
(
'LoginController'
,
[
'$scope'
,
'$http'
,
'$location'
,
'verto'
,
function
(
$scope
,
$http
,
$location
,
verto
)
{
function
(
$scope
,
$http
,
$location
,
verto
)
{
$scope
.
checkBrowser
();
$scope
.
checkBrowser
();
...
@@ -19,6 +19,11 @@
...
@@ -19,6 +19,11 @@
var
name
=
verto
.
data
.
name
;
var
name
=
verto
.
data
.
name
;
var
email
=
verto
.
data
.
email
;
var
email
=
verto
.
data
.
email
;
console
.
debug
(
"googlelogin: "
+
data
.
googlelogin
);
if
(
data
.
googlelogin
){
$scope
.
googlelogin
=
data
.
googlelogin
;
}
angular
.
extend
(
verto
.
data
,
data
);
angular
.
extend
(
verto
.
data
,
data
);
/**
/**
...
...
html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
浏览文件 @
ab4d024b
...
@@ -88,6 +88,10 @@
...
@@ -88,6 +88,10 @@
var
disconnectCallback
=
function
(
v
,
connected
)
{
var
disconnectCallback
=
function
(
v
,
connected
)
{
console
.
debug
(
'Redirecting to login page.'
);
console
.
debug
(
'Redirecting to login page.'
);
storage
.
reset
();
storage
.
reset
();
if
(
typeof
gapi
!==
'undefined'
){
console
.
debug
(
gapi
);
gapi
.
auth
.
signOut
();
}
$location
.
path
(
'/login'
);
$location
.
path
(
'/login'
);
};
};
...
@@ -277,6 +281,40 @@
...
@@ -277,6 +281,40 @@
});
});
$scope
.
$on
(
'event:google-plus-signin-success'
,
function
(
event
,
authResult
)
{
// Send login to server or save into cookie
console
.
log
(
'Google+ Login Success'
);
console
.
log
(
authResult
);
gapi
.
client
.
load
(
'plus'
,
'v1'
,
gapiClientLoaded
);
});
function
gapiClientLoaded
()
{
gapi
.
client
.
plus
.
people
.
get
({
userId
:
'me'
}).
execute
(
handleEmailResponse
);
}
function
handleEmailResponse
(
resp
){
var
primaryEmail
;
for
(
var
i
=
0
;
i
<
resp
.
emails
.
length
;
i
++
)
{
if
(
resp
.
emails
[
i
].
type
===
'account'
)
primaryEmail
=
resp
.
emails
[
i
].
value
;
}
console
.
debug
(
"Primary Email: "
+
primaryEmail
);
console
.
debug
(
"display name: "
+
resp
.
displayName
);
console
.
debug
(
"imageurl: "
+
resp
.
image
.
url
);
console
.
debug
(
resp
);
console
.
debug
(
verto
.
data
);
verto
.
data
.
email
=
primaryEmail
;
verto
.
data
.
name
=
resp
.
displayName
;
storage
.
data
.
name
=
verto
.
data
.
name
;
storage
.
data
.
email
=
verto
.
data
.
email
;
$scope
.
login
();
}
$scope
.
$on
(
'event:google-plus-signin-failure'
,
function
(
event
,
authResult
)
{
// Auth failure or signout detected
console
.
log
(
'Google+ Login Failure'
);
});
$rootScope
.
callActive
=
function
(
data
)
{
$rootScope
.
callActive
=
function
(
data
)
{
verto
.
data
.
mutedMic
=
storage
.
data
.
mutedMic
;
verto
.
data
.
mutedMic
=
storage
.
data
.
mutedMic
;
verto
.
data
.
mutedVideo
=
storage
.
data
.
mutedVideo
;
verto
.
data
.
mutedVideo
=
storage
.
data
.
mutedVideo
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论