mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 02:10:08 +00:00
preparing to move object/actions/features to their own libs...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
6a9ad3ba15
commit
5dfd470170
@ -15,6 +15,14 @@ requirejs.config({
|
||||
|
||||
// XXX this does not work on direct filesystem access...
|
||||
//urlArgs: 'bust='+Date.now(),
|
||||
|
||||
/*
|
||||
paths: {
|
||||
'lib/object': 'node_modules/ig-object',
|
||||
'ig-object': 'node_modules/ig-object',
|
||||
'object': 'node_modules/ig-object',
|
||||
},
|
||||
//*/
|
||||
})
|
||||
var _require = require
|
||||
require = requirejs
|
||||
|
||||
@ -7,6 +7,10 @@
|
||||
(function(require){ var module={} // make module AMD/node compatible...
|
||||
/*********************************************************************/
|
||||
|
||||
// XXX
|
||||
// XXX replace this with ig-features/actions
|
||||
// XXX
|
||||
|
||||
var args2array = require('lib/util').args2array
|
||||
var object = require('lib/object')
|
||||
|
||||
@ -962,7 +966,7 @@ module.MetaActions = {
|
||||
// NOTE: if 'all' is set them mixin all the actions available,
|
||||
// otherwise only mixin local actions...
|
||||
// NOTE: this will override existing own attributes.
|
||||
inlineMmixin: function(from, all, descriptors, all_attr_types){
|
||||
inlineMixin: function(from, all, descriptors, all_attr_types){
|
||||
// defaults...
|
||||
descriptors = descriptors || true
|
||||
all_attr_types = all_attr_types || false
|
||||
@ -1007,14 +1011,14 @@ module.MetaActions = {
|
||||
return this
|
||||
},
|
||||
|
||||
// Same as .inlineMmixin(..) but isolates a mixin in a seporate object
|
||||
// Same as .inlineMixin(..) but isolates a mixin in a seporate object
|
||||
// in the inheritance chain...
|
||||
//
|
||||
mixin: function(from, all, descriptors, all_attr_types){
|
||||
var proto = Object.create(this.__proto__)
|
||||
|
||||
// mixinto an empty object
|
||||
proto.inlineMmixin(from, all, descriptors, all_attr_types)
|
||||
proto.inlineMixin(from, all, descriptors, all_attr_types)
|
||||
|
||||
// mark the mixin for simpler removal...
|
||||
proto.__mixin_source = from
|
||||
|
||||
@ -7,10 +7,14 @@
|
||||
(function(require){ var module={} // make module AMD/node compatible...
|
||||
/*********************************************************************/
|
||||
|
||||
// XXX
|
||||
// XXX replace this with ig-features
|
||||
// XXX
|
||||
|
||||
var args2array = require('lib/util').args2array
|
||||
|
||||
var actions = require('lib/actions')
|
||||
var object = require('lib/object')
|
||||
var actions = module.actions = require('lib/actions')
|
||||
|
||||
|
||||
|
||||
|
||||
@ -7,6 +7,11 @@
|
||||
(function(require){ var module={} // make module AMD/node compatible...
|
||||
/*********************************************************************/
|
||||
|
||||
return require('../node_modules/ig-object/object')
|
||||
|
||||
// XXX
|
||||
// XXX replace this with ig-object
|
||||
// XXX
|
||||
|
||||
|
||||
/*********************************************************************/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user