flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a verry subtle issure with .config...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-05-11 03:22:39 +03:00
parent 599d572f3a
commit 197fcf3829
6 changed files with 86 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui (gen4)/features/core.js
View File

@ -311,7 +311,7 @@ module.makeWorkspaceConfigLoader = function(keys, callback){
keys = typeof(keys) == typeof(function(){}) ? keys() : keys keys = typeof(keys) == typeof(function(){}) ? keys() : keys
// load statusbar data... // load data...
keys.forEach(function(key){ keys.forEach(function(key){
// the key exists... // the key exists...
if(key in workspace){ if(key in workspace){

3
ui (gen4)/features/ui.js
View File

@ -1830,8 +1830,7 @@ var ControlActions = actions.Actions({
threshold: this.config['ribbon-pan-threshold'], threshold: this.config['ribbon-pan-threshold'],
}) })
r r.on('pan', function(evt){
.on('pan', function(evt){
//evt.stopPropagation() //evt.stopPropagation()
// XXX stop all previous animations... // XXX stop all previous animations...

8
ui (gen4)/index.html
View File

@ -233,9 +233,11 @@ body {
</style> </style>
<script> <script>
window.__devtools_failsafe = setTimeout(function(){ if(window.require && window.nw){
typeof(require) != 'undefined' && nw.Window.get().showDevTools() window.__devtools_failsafe = setTimeout(function(){
}, 1000) nw.Window.get().showDevTools()
}, 1000)
}
</script> </script>

8
ui (gen4)/lib/features.js
View File

@ -102,19 +102,19 @@ module.FeatureProto = {
} }
// merge config... // merge config...
// XXX should this use inheritance??? // NOTE: this will merge the actual config in .config.__proto__
// XXX do we need to clone .config? // keeping the .config clean for the user to lay with...
if(this.config != null if(this.config != null
|| (this.actions != null || (this.actions != null
&& this.actions.config != null)){ && this.actions.config != null)){
var config = this.config = this.config || this.actions.config var config = this.config = this.config || this.actions.config
if(actions.config == null){ if(actions.config == null){
actions.config = {} actions.config = Object.create({})
} }
Object.keys(config).forEach(function(n){ Object.keys(config).forEach(function(n){
// NOTE: this will overwrite existing values... // NOTE: this will overwrite existing values...
actions.config[n] = config[n] actions.config.__proto__[n] = config[n]
}) })
} }

4
ui (gen4)/lib/toggler.js
View File

@ -340,6 +340,10 @@ function CSSClassToggler(elem, classes, callback_a, callback_b){
: classes_set : classes_set
classes = typeof(classes) == typeof('str') ? ['none', classes] : classes classes = typeof(classes) == typeof('str') ? ['none', classes] : classes
if(classes == null){
console.log('!!!!!!')
}
// remove the dot from class names... // remove the dot from class names...
// NOTE: this is here because I've made the error of including a // NOTE: this is here because I've made the error of including a
// leading "." almost every time I use this after I forget // leading "." almost every time I use this after I forget

2
ui (gen4)/package.json
View File

@ -13,7 +13,7 @@
"toolbar": false, "toolbar": false,
"show": false "show": false
}, },
"chromium-args": "", "chromium-args": "--disable-gpu-compositing",
"dependencies": { "dependencies": {
"app-module-path": "^1.0.6", "app-module-path": "^1.0.6",
"commander": "^2.9.0", "commander": "^2.9.0",