Browse Source

rebuild for deploy

pull/1177/head
jlukic 10 years ago
parent
commit
be298b4ea3
12 changed files with 217 additions and 235 deletions
  1. 38
      build/less/definitions/behaviors/api.js
  2. 98
      build/less/definitions/behaviors/state.js
  3. 2
      build/minified/definitions/behaviors/api.min.js
  4. 2
      build/minified/definitions/behaviors/state.min.js
  5. 18
      build/packaged/definitions/css/semantic.css
  6. 136
      build/packaged/definitions/javascript/semantic.js
  7. 4
      build/packaged/definitions/javascript/semantic.min.js
  8. 38
      build/uncompressed/definitions/behaviors/api.js
  9. 98
      build/uncompressed/definitions/behaviors/state.js
  10. 6
      build/uncompressed/definitions/elements/flag.css
  11. 6
      build/uncompressed/definitions/elements/reveal.css
  12. 6
      build/uncompressed/definitions/modules/dropdown.css

38
build/less/definitions/behaviors/api.js

@ -64,6 +64,7 @@ $.api = $.fn.api = function(parameters) {
// standard module // standard module
element = this, element = this,
context = $context.get(),
instance = $module.data(moduleNamespace), instance = $module.data(moduleNamespace),
module module
; ;
@ -116,6 +117,7 @@ $.api = $.fn.api = function(parameters) {
module.debug('Request cancelled previous request is still pending'); module.debug('Request cancelled previous request is still pending');
return; return;
} }
// pass element metadata to url (value, text) // pass element metadata to url (value, text)
if(settings.defaultData) { if(settings.defaultData) {
$.extend(true, settings.urlData, module.get.defaultData()); $.extend(true, settings.urlData, module.get.defaultData());
@ -332,27 +334,27 @@ $.api = $.fn.api = function(parameters) {
request: { request: {
complete: function(response) { complete: function(response) {
module.remove.loading(); module.remove.loading();
$.proxy(settings.onComplete, $context)(response, $module); $.proxy(settings.onComplete, context)(response, $module);
}, },
done: function(response) { done: function(response) {
module.debug('API request received', response); module.debug('API Response Received', response);
if(settings.dataType == 'json') { if(settings.dataType == 'json') {
if( $.isFunction(settings.successTest) ) { if( $.isFunction(settings.successTest) ) {
module.debug('Checking JSON', settings.successTest, response); module.debug('Checking JSON returned success', settings.successTest, response);
if( settings.onSuccess(response) ) { if( settings.successTest(response) ) {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
else { else {
module.debug('JSON test specified by user and response failed', response); module.debug('JSON test specified by user and response failed', response);
$.proxy(settings.onFailure, $context)(response, $module); $.proxy(settings.onFailure, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
}, },
error: function(xhr, status, httpMessage) { error: function(xhr, status, httpMessage) {
@ -379,7 +381,7 @@ $.api = $.fn.api = function(parameters) {
errorMessage = response.error; errorMessage = response.error;
} }
} }
catch(er) { catch(e) {
module.error(error.JSONParse); module.error(error.JSONParse);
} }
} }
@ -391,10 +393,10 @@ $.api = $.fn.api = function(parameters) {
setTimeout(module.remove.error, settings.errorDuration); setTimeout(module.remove.error, settings.errorDuration);
} }
module.debug('API Request error:', errorMessage); module.debug('API Request error:', errorMessage);
$.proxy(settings.onFailure, $context)(errorMessage, $module); $.proxy(settings.onFailure, context)(errorMessage, $module);
} }
else { else {
$.proxy(settings.onAbort, $context)(errorMessage, $module); $.proxy(settings.onAbort, context)(errorMessage, $module);
module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage); module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage);
} }
} }
@ -742,14 +744,13 @@ $.api.settings = {
// event binding // event binding
on : 'auto', on : 'auto',
filter : '.disabled, .loading', filter : '.disabled',
context : false, context : false,
stateContext : false, stateContext : false,
// templating // templating
action : false, action : false,
url : false,
base : false,
regExp : { regExp : {
required: /\{\$*[A-z0-9]+\}/g, required: /\{\$*[A-z0-9]+\}/g,
@ -757,12 +758,12 @@ $.api.settings = {
}, },
// data // data
url : false, urlData : {},
urlData : false,
serializeForm : false,
// ui // ui
defaultData : true, defaultData : true,
serializeForm : false,
throttle : 100, throttle : 100,
allowMultiple : false, allowMultiple : false,
@ -774,7 +775,6 @@ $.api.settings = {
method : 'get', method : 'get',
data : {}, data : {},
dataType : 'json', dataType : 'json',
cache : true,
// callbacks // callbacks
beforeSend : function(settings) { return settings; }, beforeSend : function(settings) { return settings; },
@ -785,7 +785,7 @@ $.api.settings = {
onFailure : function(errorMessage, $module) {}, onFailure : function(errorMessage, $module) {},
onAbort : function(errorMessage, $module) {}, onAbort : function(errorMessage, $module) {},
successText : function(response) { return true; }, successTest : false,
// errors // errors
error : { error : {

98
build/less/definitions/behaviors/state.js

@ -14,7 +14,6 @@
$.fn.state = function(parameters) { $.fn.state = function(parameters) {
var var
$allModules = $(this), $allModules = $(this),
settings = $.extend(true, {}, $.fn.state.settings, parameters),
moduleSelector = $allModules.selector || '', moduleSelector = $allModules.selector || '',
@ -26,27 +25,29 @@ $.fn.state = function(parameters) {
methodInvoked = (typeof query == 'string'), methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1), queryArguments = [].slice.call(arguments, 1),
// shortcuts
error = settings.error,
metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
returnedValue returnedValue
; ;
$allModules $allModules
.each(function() { .each(function() {
var var
$module = $(this), settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.state.settings, parameters)
: $.extend({}, $.fn.state.settings),
error = settings.error,
metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
element = this, $module = $(this),
instance = $module.data(moduleNamespace), element = this,
instance = $module.data(moduleNamespace),
module module
; ;
@ -265,19 +266,19 @@ $.fn.state = function(parameters) {
module.verbose('Changing text to hover text', text.hover); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.disable) { else if(text.deactivate) {
module.verbose('Changing text to disable text', text.disable); module.verbose('Changing text to deactivating text', text.deactivate);
module.update.text(text.disable); module.update.text(text.deactivate);
} }
} }
else { else {
if(text.hover) { if(text.hover) {
module.verbose('Changing text to hover text', text.disable); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.enable){ else if(text.activate){
module.verbose('Changing text to enable text', text.enable); module.verbose('Changing text to activating text', text.activate);
module.update.text(text.enable); module.update.text(text.activate);
} }
} }
} }
@ -292,8 +293,8 @@ $.fn.state = function(parameters) {
.addClass(className.active) .addClass(className.active)
; ;
module.update.text(text.active); module.update.text(text.active);
$.proxy(settings.onActivate, element)();
} }
$.proxy(settings.onActivate, element)();
}, },
deactivate: function() { deactivate: function() {
@ -303,8 +304,8 @@ $.fn.state = function(parameters) {
.removeClass(className.active) .removeClass(className.active)
; ;
module.update.text(text.inactive); module.update.text(text.inactive);
$.proxy(settings.onDeactivate, element)();
} }
$.proxy(settings.onDeactivate, element)();
}, },
sync: function() { sync: function() {
@ -400,27 +401,22 @@ $.fn.state = function(parameters) {
setting: function(name, value) { setting: function(name, value) {
module.debug('Changing setting', name, value); module.debug('Changing setting', name, value);
if(value !== undefined) { if( $.isPlainObject(name) ) {
if( $.isPlainObject(name) ) { $.extend(true, settings, name);
$.extend(true, settings, name); }
} else if(value !== undefined) {
else { settings[name] = value;
settings[name] = value;
}
} }
else { else {
return settings[name]; return settings[name];
} }
}, },
internal: function(name, value) { internal: function(name, value) {
module.debug('Changing internal', name, value); if( $.isPlainObject(name) ) {
if(value !== undefined) { $.extend(true, module, name);
if( $.isPlainObject(name) ) { }
$.extend(true, module, name); else if(value !== undefined) {
} module[name] = value;
else {
module[name] = value;
}
} }
else { else {
return module[name]; return module[name];
@ -488,9 +484,6 @@ $.fn.state = function(parameters) {
if(moduleSelector) { if(moduleSelector) {
title += ' \'' + moduleSelector + '\''; title += ' \'' + moduleSelector + '\'';
} }
if($allModules.size() > 1) {
title += ' ' + '(' + $allModules.size() + ')';
}
if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
console.groupCollapsed(title); console.groupCollapsed(title);
if(console.table) { if(console.table) {
@ -538,6 +531,7 @@ $.fn.state = function(parameters) {
return false; return false;
} }
else { else {
module.error(error.method, query);
return false; return false;
} }
}); });
@ -560,6 +554,7 @@ $.fn.state = function(parameters) {
return found; return found;
} }
}; };
if(methodInvoked) { if(methodInvoked) {
if(instance === undefined) { if(instance === undefined) {
module.initialize(); module.initialize();
@ -572,7 +567,6 @@ $.fn.state = function(parameters) {
} }
module.initialize(); module.initialize();
} }
}) })
; ;
@ -615,7 +609,7 @@ $.fn.state.settings = {
sync : false, sync : false,
// default flash text duration, used for temporarily changing text of an element // default flash text duration, used for temporarily changing text of an element
flashDuration : 3000, flashDuration : 1000,
// selector filter // selector filter
filter : { filter : {
@ -680,13 +674,13 @@ $.fn.state.settings = {
}, },
text : { text : {
disabled : false, disabled : false,
flash : false, flash : false,
hover : false, hover : false,
active : false, active : false,
inactive : false, inactive : false,
enable : false, activate : false,
disable : false deactivate : false
} }
}; };

2
build/minified/definitions/behaviors/api.min.js
File diff suppressed because it is too large
View File

2
build/minified/definitions/behaviors/state.min.js
File diff suppressed because it is too large
View File

18
build/packaged/definitions/css/semantic.css

@ -8421,15 +8421,15 @@
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Flag Flag
*******************************/ *******************************/
/*------------------- /*-------------------
Element Element
--------------------*/ --------------------*/
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/
@ -15926,12 +15926,12 @@ ol.ui.horizontal.list li:before,
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Reveal Reveal
*******************************/ *******************************/
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/
@ -19886,6 +19886,9 @@ body.dimmed.dimmable > :not(.dimmer) {
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Dropdown Dropdown
*******************************/ *******************************/
@ -19928,9 +19931,6 @@ b Types
/* Simple */ /* Simple */
/* Floating */ /* Floating */
/* Pointing */ /* Pointing */
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/

136
build/packaged/definitions/javascript/semantic.js

@ -64,6 +64,7 @@ $.api = $.fn.api = function(parameters) {
// standard module // standard module
element = this, element = this,
context = $context.get(),
instance = $module.data(moduleNamespace), instance = $module.data(moduleNamespace),
module module
; ;
@ -116,6 +117,7 @@ $.api = $.fn.api = function(parameters) {
module.debug('Request cancelled previous request is still pending'); module.debug('Request cancelled previous request is still pending');
return; return;
} }
// pass element metadata to url (value, text) // pass element metadata to url (value, text)
if(settings.defaultData) { if(settings.defaultData) {
$.extend(true, settings.urlData, module.get.defaultData()); $.extend(true, settings.urlData, module.get.defaultData());
@ -332,27 +334,27 @@ $.api = $.fn.api = function(parameters) {
request: { request: {
complete: function(response) { complete: function(response) {
module.remove.loading(); module.remove.loading();
$.proxy(settings.onComplete, $context)(response, $module); $.proxy(settings.onComplete, context)(response, $module);
}, },
done: function(response) { done: function(response) {
module.debug('API request received', response); module.debug('API Response Received', response);
if(settings.dataType == 'json') { if(settings.dataType == 'json') {
if( $.isFunction(settings.successTest) ) { if( $.isFunction(settings.successTest) ) {
module.debug('Checking JSON', settings.successTest, response); module.debug('Checking JSON returned success', settings.successTest, response);
if( settings.onSuccess(response) ) { if( settings.successTest(response) ) {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
else { else {
module.debug('JSON test specified by user and response failed', response); module.debug('JSON test specified by user and response failed', response);
$.proxy(settings.onFailure, $context)(response, $module); $.proxy(settings.onFailure, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
}, },
error: function(xhr, status, httpMessage) { error: function(xhr, status, httpMessage) {
@ -379,7 +381,7 @@ $.api = $.fn.api = function(parameters) {
errorMessage = response.error; errorMessage = response.error;
} }
} }
catch(er) { catch(e) {
module.error(error.JSONParse); module.error(error.JSONParse);
} }
} }
@ -391,10 +393,10 @@ $.api = $.fn.api = function(parameters) {
setTimeout(module.remove.error, settings.errorDuration); setTimeout(module.remove.error, settings.errorDuration);
} }
module.debug('API Request error:', errorMessage); module.debug('API Request error:', errorMessage);
$.proxy(settings.onFailure, $context)(errorMessage, $module); $.proxy(settings.onFailure, context)(errorMessage, $module);
} }
else { else {
$.proxy(settings.onAbort, $context)(errorMessage, $module); $.proxy(settings.onAbort, context)(errorMessage, $module);
module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage); module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage);
} }
} }
@ -742,14 +744,13 @@ $.api.settings = {
// event binding // event binding
on : 'auto', on : 'auto',
filter : '.disabled, .loading', filter : '.disabled',
context : false, context : false,
stateContext : false, stateContext : false,
// templating // templating
action : false, action : false,
url : false,
base : false,
regExp : { regExp : {
required: /\{\$*[A-z0-9]+\}/g, required: /\{\$*[A-z0-9]+\}/g,
@ -757,12 +758,12 @@ $.api.settings = {
}, },
// data // data
url : false, urlData : {},
urlData : false,
serializeForm : false,
// ui // ui
defaultData : true, defaultData : true,
serializeForm : false,
throttle : 100, throttle : 100,
allowMultiple : false, allowMultiple : false,
@ -774,7 +775,6 @@ $.api.settings = {
method : 'get', method : 'get',
data : {}, data : {},
dataType : 'json', dataType : 'json',
cache : true,
// callbacks // callbacks
beforeSend : function(settings) { return settings; }, beforeSend : function(settings) { return settings; },
@ -785,7 +785,7 @@ $.api.settings = {
onFailure : function(errorMessage, $module) {}, onFailure : function(errorMessage, $module) {},
onAbort : function(errorMessage, $module) {}, onAbort : function(errorMessage, $module) {},
successText : function(response) { return true; }, successTest : false,
// errors // errors
error : { error : {
@ -1907,7 +1907,6 @@ $.fn.form.settings = {
$.fn.state = function(parameters) { $.fn.state = function(parameters) {
var var
$allModules = $(this), $allModules = $(this),
settings = $.extend(true, {}, $.fn.state.settings, parameters),
moduleSelector = $allModules.selector || '', moduleSelector = $allModules.selector || '',
@ -1919,27 +1918,29 @@ $.fn.state = function(parameters) {
methodInvoked = (typeof query == 'string'), methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1), queryArguments = [].slice.call(arguments, 1),
// shortcuts
error = settings.error,
metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
returnedValue returnedValue
; ;
$allModules $allModules
.each(function() { .each(function() {
var var
$module = $(this), settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.state.settings, parameters)
: $.extend({}, $.fn.state.settings),
element = this, error = settings.error,
instance = $module.data(moduleNamespace), metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
$module = $(this),
element = this,
instance = $module.data(moduleNamespace),
module module
; ;
@ -2158,19 +2159,19 @@ $.fn.state = function(parameters) {
module.verbose('Changing text to hover text', text.hover); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.disable) { else if(text.deactivate) {
module.verbose('Changing text to disable text', text.disable); module.verbose('Changing text to deactivating text', text.deactivate);
module.update.text(text.disable); module.update.text(text.deactivate);
} }
} }
else { else {
if(text.hover) { if(text.hover) {
module.verbose('Changing text to hover text', text.disable); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.enable){ else if(text.activate){
module.verbose('Changing text to enable text', text.enable); module.verbose('Changing text to activating text', text.activate);
module.update.text(text.enable); module.update.text(text.activate);
} }
} }
} }
@ -2185,8 +2186,8 @@ $.fn.state = function(parameters) {
.addClass(className.active) .addClass(className.active)
; ;
module.update.text(text.active); module.update.text(text.active);
$.proxy(settings.onActivate, element)();
} }
$.proxy(settings.onActivate, element)();
}, },
deactivate: function() { deactivate: function() {
@ -2196,8 +2197,8 @@ $.fn.state = function(parameters) {
.removeClass(className.active) .removeClass(className.active)
; ;
module.update.text(text.inactive); module.update.text(text.inactive);
$.proxy(settings.onDeactivate, element)();
} }
$.proxy(settings.onDeactivate, element)();
}, },
sync: function() { sync: function() {
@ -2293,27 +2294,22 @@ $.fn.state = function(parameters) {
setting: function(name, value) { setting: function(name, value) {
module.debug('Changing setting', name, value); module.debug('Changing setting', name, value);
if(value !== undefined) { if( $.isPlainObject(name) ) {
if( $.isPlainObject(name) ) { $.extend(true, settings, name);
$.extend(true, settings, name); }
} else if(value !== undefined) {
else { settings[name] = value;
settings[name] = value;
}
} }
else { else {
return settings[name]; return settings[name];
} }
}, },
internal: function(name, value) { internal: function(name, value) {
module.debug('Changing internal', name, value); if( $.isPlainObject(name) ) {
if(value !== undefined) { $.extend(true, module, name);
if( $.isPlainObject(name) ) { }
$.extend(true, module, name); else if(value !== undefined) {
} module[name] = value;
else {
module[name] = value;
}
} }
else { else {
return module[name]; return module[name];
@ -2381,9 +2377,6 @@ $.fn.state = function(parameters) {
if(moduleSelector) { if(moduleSelector) {
title += ' \'' + moduleSelector + '\''; title += ' \'' + moduleSelector + '\'';
} }
if($allModules.size() > 1) {
title += ' ' + '(' + $allModules.size() + ')';
}
if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
console.groupCollapsed(title); console.groupCollapsed(title);
if(console.table) { if(console.table) {
@ -2431,6 +2424,7 @@ $.fn.state = function(parameters) {
return false; return false;
} }
else { else {
module.error(error.method, query);
return false; return false;
} }
}); });
@ -2453,6 +2447,7 @@ $.fn.state = function(parameters) {
return found; return found;
} }
}; };
if(methodInvoked) { if(methodInvoked) {
if(instance === undefined) { if(instance === undefined) {
module.initialize(); module.initialize();
@ -2465,7 +2460,6 @@ $.fn.state = function(parameters) {
} }
module.initialize(); module.initialize();
} }
}) })
; ;
@ -2508,7 +2502,7 @@ $.fn.state.settings = {
sync : false, sync : false,
// default flash text duration, used for temporarily changing text of an element // default flash text duration, used for temporarily changing text of an element
flashDuration : 3000, flashDuration : 1000,
// selector filter // selector filter
filter : { filter : {
@ -2573,13 +2567,13 @@ $.fn.state.settings = {
}, },
text : { text : {
disabled : false, disabled : false,
flash : false, flash : false,
hover : false, hover : false,
active : false, active : false,
inactive : false, inactive : false,
enable : false, activate : false,
disable : false deactivate : false
} }
}; };

4
build/packaged/definitions/javascript/semantic.min.js
File diff suppressed because it is too large
View File

38
build/uncompressed/definitions/behaviors/api.js

@ -64,6 +64,7 @@ $.api = $.fn.api = function(parameters) {
// standard module // standard module
element = this, element = this,
context = $context.get(),
instance = $module.data(moduleNamespace), instance = $module.data(moduleNamespace),
module module
; ;
@ -116,6 +117,7 @@ $.api = $.fn.api = function(parameters) {
module.debug('Request cancelled previous request is still pending'); module.debug('Request cancelled previous request is still pending');
return; return;
} }
// pass element metadata to url (value, text) // pass element metadata to url (value, text)
if(settings.defaultData) { if(settings.defaultData) {
$.extend(true, settings.urlData, module.get.defaultData()); $.extend(true, settings.urlData, module.get.defaultData());
@ -332,27 +334,27 @@ $.api = $.fn.api = function(parameters) {
request: { request: {
complete: function(response) { complete: function(response) {
module.remove.loading(); module.remove.loading();
$.proxy(settings.onComplete, $context)(response, $module); $.proxy(settings.onComplete, context)(response, $module);
}, },
done: function(response) { done: function(response) {
module.debug('API request received', response); module.debug('API Response Received', response);
if(settings.dataType == 'json') { if(settings.dataType == 'json') {
if( $.isFunction(settings.successTest) ) { if( $.isFunction(settings.successTest) ) {
module.debug('Checking JSON', settings.successTest, response); module.debug('Checking JSON returned success', settings.successTest, response);
if( settings.onSuccess(response) ) { if( settings.successTest(response) ) {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
else { else {
module.debug('JSON test specified by user and response failed', response); module.debug('JSON test specified by user and response failed', response);
$.proxy(settings.onFailure, $context)(response, $module); $.proxy(settings.onFailure, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
} }
else { else {
$.proxy(settings.onSuccess, $context)(response, $module); $.proxy(settings.onSuccess, context)(response, $module);
} }
}, },
error: function(xhr, status, httpMessage) { error: function(xhr, status, httpMessage) {
@ -379,7 +381,7 @@ $.api = $.fn.api = function(parameters) {
errorMessage = response.error; errorMessage = response.error;
} }
} }
catch(er) { catch(e) {
module.error(error.JSONParse); module.error(error.JSONParse);
} }
} }
@ -391,10 +393,10 @@ $.api = $.fn.api = function(parameters) {
setTimeout(module.remove.error, settings.errorDuration); setTimeout(module.remove.error, settings.errorDuration);
} }
module.debug('API Request error:', errorMessage); module.debug('API Request error:', errorMessage);
$.proxy(settings.onFailure, $context)(errorMessage, $module); $.proxy(settings.onFailure, context)(errorMessage, $module);
} }
else { else {
$.proxy(settings.onAbort, $context)(errorMessage, $module); $.proxy(settings.onAbort, context)(errorMessage, $module);
module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage); module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage);
} }
} }
@ -742,14 +744,13 @@ $.api.settings = {
// event binding // event binding
on : 'auto', on : 'auto',
filter : '.disabled, .loading', filter : '.disabled',
context : false, context : false,
stateContext : false, stateContext : false,
// templating // templating
action : false, action : false,
url : false,
base : false,
regExp : { regExp : {
required: /\{\$*[A-z0-9]+\}/g, required: /\{\$*[A-z0-9]+\}/g,
@ -757,12 +758,12 @@ $.api.settings = {
}, },
// data // data
url : false, urlData : {},
urlData : false,
serializeForm : false,
// ui // ui
defaultData : true, defaultData : true,
serializeForm : false,
throttle : 100, throttle : 100,
allowMultiple : false, allowMultiple : false,
@ -774,7 +775,6 @@ $.api.settings = {
method : 'get', method : 'get',
data : {}, data : {},
dataType : 'json', dataType : 'json',
cache : true,
// callbacks // callbacks
beforeSend : function(settings) { return settings; }, beforeSend : function(settings) { return settings; },
@ -785,7 +785,7 @@ $.api.settings = {
onFailure : function(errorMessage, $module) {}, onFailure : function(errorMessage, $module) {},
onAbort : function(errorMessage, $module) {}, onAbort : function(errorMessage, $module) {},
successText : function(response) { return true; }, successTest : false,
// errors // errors
error : { error : {

98
build/uncompressed/definitions/behaviors/state.js

@ -14,7 +14,6 @@
$.fn.state = function(parameters) { $.fn.state = function(parameters) {
var var
$allModules = $(this), $allModules = $(this),
settings = $.extend(true, {}, $.fn.state.settings, parameters),
moduleSelector = $allModules.selector || '', moduleSelector = $allModules.selector || '',
@ -26,27 +25,29 @@ $.fn.state = function(parameters) {
methodInvoked = (typeof query == 'string'), methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1), queryArguments = [].slice.call(arguments, 1),
// shortcuts
error = settings.error,
metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
returnedValue returnedValue
; ;
$allModules $allModules
.each(function() { .each(function() {
var var
$module = $(this), settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.state.settings, parameters)
: $.extend({}, $.fn.state.settings),
error = settings.error,
metadata = settings.metadata,
className = settings.className,
namespace = settings.namespace,
states = settings.states,
text = settings.text,
eventNamespace = '.' + namespace,
moduleNamespace = namespace + '-module',
element = this, $module = $(this),
instance = $module.data(moduleNamespace), element = this,
instance = $module.data(moduleNamespace),
module module
; ;
@ -265,19 +266,19 @@ $.fn.state = function(parameters) {
module.verbose('Changing text to hover text', text.hover); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.disable) { else if(text.deactivate) {
module.verbose('Changing text to disable text', text.disable); module.verbose('Changing text to deactivating text', text.deactivate);
module.update.text(text.disable); module.update.text(text.deactivate);
} }
} }
else { else {
if(text.hover) { if(text.hover) {
module.verbose('Changing text to hover text', text.disable); module.verbose('Changing text to hover text', text.hover);
module.update.text(text.hover); module.update.text(text.hover);
} }
else if(text.enable){ else if(text.activate){
module.verbose('Changing text to enable text', text.enable); module.verbose('Changing text to activating text', text.activate);
module.update.text(text.enable); module.update.text(text.activate);
} }
} }
} }
@ -292,8 +293,8 @@ $.fn.state = function(parameters) {
.addClass(className.active) .addClass(className.active)
; ;
module.update.text(text.active); module.update.text(text.active);
$.proxy(settings.onActivate, element)();
} }
$.proxy(settings.onActivate, element)();
}, },
deactivate: function() { deactivate: function() {
@ -303,8 +304,8 @@ $.fn.state = function(parameters) {
.removeClass(className.active) .removeClass(className.active)
; ;
module.update.text(text.inactive); module.update.text(text.inactive);
$.proxy(settings.onDeactivate, element)();
} }
$.proxy(settings.onDeactivate, element)();
}, },
sync: function() { sync: function() {
@ -400,27 +401,22 @@ $.fn.state = function(parameters) {
setting: function(name, value) { setting: function(name, value) {
module.debug('Changing setting', name, value); module.debug('Changing setting', name, value);
if(value !== undefined) { if( $.isPlainObject(name) ) {
if( $.isPlainObject(name) ) { $.extend(true, settings, name);
$.extend(true, settings, name); }
} else if(value !== undefined) {
else { settings[name] = value;
settings[name] = value;
}
} }
else { else {
return settings[name]; return settings[name];
} }
}, },
internal: function(name, value) { internal: function(name, value) {
module.debug('Changing internal', name, value); if( $.isPlainObject(name) ) {
if(value !== undefined) { $.extend(true, module, name);
if( $.isPlainObject(name) ) { }
$.extend(true, module, name); else if(value !== undefined) {
} module[name] = value;
else {
module[name] = value;
}
} }
else { else {
return module[name]; return module[name];
@ -488,9 +484,6 @@ $.fn.state = function(parameters) {
if(moduleSelector) { if(moduleSelector) {
title += ' \'' + moduleSelector + '\''; title += ' \'' + moduleSelector + '\'';
} }
if($allModules.size() > 1) {
title += ' ' + '(' + $allModules.size() + ')';
}
if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) { if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
console.groupCollapsed(title); console.groupCollapsed(title);
if(console.table) { if(console.table) {
@ -538,6 +531,7 @@ $.fn.state = function(parameters) {
return false; return false;
} }
else { else {
module.error(error.method, query);
return false; return false;
} }
}); });
@ -560,6 +554,7 @@ $.fn.state = function(parameters) {
return found; return found;
} }
}; };
if(methodInvoked) { if(methodInvoked) {
if(instance === undefined) { if(instance === undefined) {
module.initialize(); module.initialize();
@ -572,7 +567,6 @@ $.fn.state = function(parameters) {
} }
module.initialize(); module.initialize();
} }
}) })
; ;
@ -615,7 +609,7 @@ $.fn.state.settings = {
sync : false, sync : false,
// default flash text duration, used for temporarily changing text of an element // default flash text duration, used for temporarily changing text of an element
flashDuration : 3000, flashDuration : 1000,
// selector filter // selector filter
filter : { filter : {
@ -680,13 +674,13 @@ $.fn.state.settings = {
}, },
text : { text : {
disabled : false, disabled : false,
flash : false, flash : false,
hover : false, hover : false,
active : false, active : false,
inactive : false, inactive : false,
enable : false, activate : false,
disable : false deactivate : false
} }
}; };

6
build/uncompressed/definitions/elements/flag.css

@ -144,15 +144,15 @@
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Flag Flag
*******************************/ *******************************/
/*------------------- /*-------------------
Element Element
--------------------*/ --------------------*/
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/

6
build/uncompressed/definitions/elements/reveal.css

@ -144,12 +144,12 @@
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Reveal Reveal
*******************************/ *******************************/
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/

6
build/uncompressed/definitions/modules/dropdown.css

@ -144,6 +144,9 @@
/*--- Standard ---*/ /*--- Standard ---*/
/*--- Emotive ---*/ /*--- Emotive ---*/
/*--- Neutrals ---*/ /*--- Neutrals ---*/
/*------------------
Load Theme
-------------------*/
/******************************* /*******************************
Dropdown Dropdown
*******************************/ *******************************/
@ -186,9 +189,6 @@ b Types
/* Simple */ /* Simple */
/* Floating */ /* Floating */
/* Pointing */ /* Pointing */
/*------------------
Load Theme
-------------------*/
/*------------------ /*------------------
Load Site Load Site
-------------------*/ -------------------*/

|||||||
100:0
Loading…
Cancel
Save