Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mui
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mui
Commits
7dfc1fdc
Commit
7dfc1fdc
authored
Aug 30, 2014
by
hbcui1984
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MUI框架不再监听首页的back按键
parent
f34db8d8
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
48 deletions
+51
-48
dist/css/mui.css
dist/css/mui.css
+6
-5
dist/css/mui.min.css
dist/css/mui.min.css
+2
-2
dist/js/mui.js
dist/js/mui.js
+40
-38
dist/js/mui.min.js
dist/js/mui.min.js
+3
-3
No files found.
dist/css/mui.css
View file @
7dfc1fdc
/*!
/*!
* =====================================================
* =====================================================
* Mui v0.5.
3
(https://github.com/dcloudio/mui)
* Mui v0.5.
4
(https://github.com/dcloudio/mui)
* =====================================================
* =====================================================
*/
*/
...
@@ -933,19 +933,19 @@ input[type="submit"]:active, input[type="submit"].mui-active,
...
@@ -933,19 +933,19 @@ input[type="submit"]:active, input[type="submit"].mui-active,
.mui-btn-outlined.mui-btn-primary
,
.mui-btn-outlined.mui-btn-blue
{
.mui-btn-outlined.mui-btn-primary
,
.mui-btn-outlined.mui-btn-blue
{
color
:
#007aff
;
color
:
#007aff
;
}
}
.mui-btn-outlined.mui-btn-success
,
.mui-btn-outlined.mui-btn-green
{
.mui-btn-outlined.mui-btn-
positive
,
.mui-btn-outlined.mui-btn-
success
,
.mui-btn-outlined.mui-btn-green
{
color
:
#4cd964
;
color
:
#4cd964
;
}
}
.mui-btn-outlined.mui-btn-warning
,
.mui-btn-outlined.mui-btn-yellow
{
.mui-btn-outlined.mui-btn-warning
,
.mui-btn-outlined.mui-btn-yellow
{
color
:
#f0ad4e
;
color
:
#f0ad4e
;
}
}
.mui-btn-outlined.mui-btn-danger
,
.mui-btn-outlined.mui-btn-red
{
.mui-btn-outlined.mui-btn-
negative
,
.mui-btn-outlined.mui-btn-
danger
,
.mui-btn-outlined.mui-btn-red
{
color
:
#dd524d
;
color
:
#dd524d
;
}
}
.mui-btn-outlined.mui-btn-royal
,
.mui-btn-outlined.mui-btn-purple
{
.mui-btn-outlined.mui-btn-royal
,
.mui-btn-outlined.mui-btn-purple
{
color
:
#8a6de9
;
color
:
#8a6de9
;
}
}
.mui-btn-outlined.mui-btn-primary
:active
,
.mui-btn-outlined.mui-btn-blue
:active
,
.mui-btn-outlined.mui-btn-
success
:active
,
.mui-btn-outlined.mui-btn-green
:active
,
.mui-btn-outlined.mui-btn-warning
:active
,
.mui-btn-outlined.mui-btn-yellow
:active
,
.mui-btn-outlined.mui-btn-danger
:active
,
.mui-btn-outlined.mui-btn-red
:active
,
.mui-btn-outlined.mui-btn-royal
:active
,
.mui-btn-outlined.mui-btn-purple
:active
{
.mui-btn-outlined.mui-btn-primary
:active
,
.mui-btn-outlined.mui-btn-blue
:active
,
.mui-btn-outlined.mui-btn-
positive
:active
,
.mui-btn-outlined.mui-btn-success
:active
,
.mui-btn-outlined.mui-btn-green
:active
,
.mui-btn-outlined.mui-btn-warning
:active
,
.mui-btn-outlined.mui-btn-yellow
:active
,
.mui-btn-outlined.mui-btn-negative
:active
,
.mui-btn-outlined.mui-btn-danger
:active
,
.mui-btn-outlined.mui-btn-red
:active
,
.mui-btn-outlined.mui-btn-royal
:active
,
.mui-btn-outlined.mui-btn-purple
:active
{
color
:
#fff
;
color
:
#fff
;
}
}
...
@@ -1229,6 +1229,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
...
@@ -1229,6 +1229,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
.mui-bar
.mui-segmented-control
{
.mui-bar
.mui-segmented-control
{
top
:
7px
;
top
:
7px
;
width
:
auto
;
margin
:
0
auto
;
margin
:
0
auto
;
}
}
...
@@ -1727,7 +1728,7 @@ select {
...
@@ -1727,7 +1728,7 @@ select {
.mui-input-row
label
{
.mui-input-row
label
{
float
:
left
;
float
:
left
;
width
:
35%
;
width
:
35%
;
padding
:
8px
20
px
;
padding
:
8px
15
px
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
sans-serif
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
sans-serif
;
line-height
:
1.1
;
line-height
:
1.1
;
}
}
...
...
dist/css/mui.min.css
View file @
7dfc1fdc
This diff is collapsed.
Click to expand it.
dist/js/mui.js
View file @
7dfc1fdc
/*!
/*!
* =====================================================
* =====================================================
* Mui v0.5.
3
(https://github.com/dcloudio/mui)
* Mui v0.5.
4
(https://github.com/dcloudio/mui)
* =====================================================
* =====================================================
*/
*/
/**
/**
...
@@ -1334,17 +1334,21 @@ window.mui = mui;
...
@@ -1334,17 +1334,21 @@ window.mui = mui;
$
.
init
.
add
(
function
()
{
$
.
init
.
add
(
function
()
{
var
options
=
$
.
options
;
var
options
=
$
.
options
;
var
pullRefreshOptions
=
options
.
pullRefresh
||
{};
var
pullRefreshOptions
=
options
.
pullRefresh
||
{};
//只要是android手机,必须使用原生的下拉刷新;
if
(
$
.
os
.
plus
&&
$
.
os
.
android
){
if
(
pullRefreshOptions
.
down
){
$
.
plus_pulldownRefresh
(
pullRefreshOptions
.
down
);
}
}
else
{
var
container
=
pullRefreshOptions
.
container
;
var
container
=
pullRefreshOptions
.
container
;
if
(
container
)
{
if
(
container
)
{
var
$container
=
$
(
container
);
var
$container
=
$
(
container
);
if
(
$container
.
length
===
1
)
{
if
(
$container
.
length
===
1
)
{
if
(
$
.
options
.
optimize
&&
$
.
os
.
plus
&&
$
.
os
.
android
)
{
//android and optimize
$container
.
plus_pulldownRefresh
(
pullRefreshOptions
.
down
);
}
else
{
$container
.
pullRefresh
(
pullRefreshOptions
);
$container
.
pullRefresh
(
pullRefreshOptions
);
}
}
}
}
}
}
});
});
})(
mui
);
})(
mui
);
/**
/**
...
@@ -1832,11 +1836,10 @@ window.mui = mui;
...
@@ -1832,11 +1836,10 @@ window.mui = mui;
contentrefresh
:
'
正在刷新...
'
contentrefresh
:
'
正在刷新...
'
}
}
$
.
fn
.
plus_pulldownRefresh
=
function
(
options
)
{
$
.
plus_pulldownRefresh
=
function
(
options
)
{
options
=
$
.
extend
(
pulldownOptions
,
options
,
true
);
options
=
$
.
extend
(
pulldownOptions
,
options
,
true
);
this
.
each
(
function
()
{
var
self
=
this
;
$
.
plusReady
(
function
()
{
$
.
plusReady
(
function
()
{
var
self
=
document
.
body
;
var
id
=
self
.
getAttribute
(
'
data-pullrefresh-plus
'
);
var
id
=
self
.
getAttribute
(
'
data-pullrefresh-plus
'
);
if
(
!
id
)
{
//避免重复初始化5+ pullrefresh
if
(
!
id
)
{
//避免重复初始化5+ pullrefresh
id
=
++
$
.
uuid
;
id
=
++
$
.
uuid
;
...
@@ -1863,8 +1866,6 @@ window.mui = mui;
...
@@ -1863,8 +1866,6 @@ window.mui = mui;
}
}
});
});
});
};
};
})(
mui
);
})(
mui
);
...
@@ -3780,7 +3781,8 @@ window.mui = mui;
...
@@ -3780,7 +3781,8 @@ window.mui = mui;
//opener.show();
//opener.show();
}
else
{
}
else
{
//首页不存在opener的情况下,后退实际上应该是退出应用;
//首页不存在opener的情况下,后退实际上应该是退出应用;
plus
.
runtime
.
quit
();
//这个交给项目具体实现,框架暂不处理;
//plus.runtime.quit();
}
}
}
}
});
});
...
...
dist/js/mui.min.js
View file @
7dfc1fdc
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment