merb-ui 0.4.7 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +1 -1
- data/app/views/styles/index.css.erb +0 -1
- data/public/javascripts/main.js +15 -16
- metadata +1 -1
data/Rakefile
CHANGED
|
@@ -203,7 +203,6 @@ button.mui_button td {
|
|
|
203
203
|
border: 1px solid <%= color(0.95, 0.95, 0.95) %>;
|
|
204
204
|
border-bottom-color: <%= color(1, 1, 1) %>;
|
|
205
205
|
border-top-color: <%= color(0.8, 0.8, 0.8) %>;
|
|
206
|
-
display: inline-block;
|
|
207
206
|
font-weight: bold;
|
|
208
207
|
line-height: 1.7em;
|
|
209
208
|
min-height: 1.7em;
|
data/public/javascripts/main.js
CHANGED
|
@@ -44,7 +44,6 @@ function muiWindowOpen(url){
|
|
|
44
44
|
}
|
|
45
45
|
$('.mui_window_target').fadeIn();
|
|
46
46
|
}
|
|
47
|
-
$('.mui_focus:first').focus();
|
|
48
47
|
$('.mui_click_window_close').click(function(){
|
|
49
48
|
muiWindowClose(this.id);
|
|
50
49
|
});
|
|
@@ -55,24 +54,10 @@ function muiWindowOpen(url){
|
|
|
55
54
|
'containment': 'window',
|
|
56
55
|
'handle': '.mui_window_bar'
|
|
57
56
|
});
|
|
57
|
+
$('input.mui_focus:first').focus();
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
$(document).ready(function(){
|
|
62
|
-
|
|
63
|
-
// Buttons
|
|
64
|
-
$('.mui_click').click(function(){
|
|
65
|
-
window.location = this.id;
|
|
66
|
-
});
|
|
67
|
-
$('.mui_click_window_open').click(function(){
|
|
68
|
-
muiWindowOpen(this.id);
|
|
69
|
-
});
|
|
70
|
-
|
|
71
|
-
// Focus
|
|
72
|
-
$('.mui_focus:first').focus();
|
|
73
|
-
|
|
74
|
-
});
|
|
75
|
-
|
|
76
61
|
// Keys
|
|
77
62
|
$(document).keybind('ctrl+shift+P', function(){
|
|
78
63
|
muiWindowOpen('/password/read');
|
|
@@ -95,3 +80,17 @@ $(document).keybind('right', function(){
|
|
|
95
80
|
$('[name=next]').click();
|
|
96
81
|
});
|
|
97
82
|
|
|
83
|
+
// Buttons
|
|
84
|
+
$(document).ready(function(){
|
|
85
|
+
$('.mui_click').click(function(){
|
|
86
|
+
window.location = this.id;
|
|
87
|
+
});
|
|
88
|
+
$('.mui_click_window_open').click(function(){
|
|
89
|
+
muiWindowOpen(this.id);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
// Focus
|
|
94
|
+
$(window).load(function(){
|
|
95
|
+
$('input.mui_focus:first').focus();
|
|
96
|
+
});
|